Add more validations on models