WIP: Refactoring validations