Added Validations and Associations