Added Associations and Validations