Added basic validations to models