Initial validation reworking. Extracted few first validation handlers into directives.