Restored Custom Validation, cleaned the form Gen Directive