Validation:
 * Moved old (inconsistent) logic to deprecated validators.
 * Added more consistent new validators
 * Added a switch that currently still executes the old validation logic.