2.5 - Adding validations