seems like a regex could easily cover both existing cases then - and would be serializable