Refactoring existing validators and implementation of new