Now using a base class re validation directives
Cleanup re new validation base class