Add belongs_to and has_many associations