Add TODO for re-indexing.
Move RegEx to constants. Refactor to have common value validation functions.