Validations

Added validations and merged with master branch