Updated Controllers and Relationships