Added validations

Saving this for a refactoring