Changed registered validators to validator factories. Extracted conditions into classes.