Add validations and db relationships