Updated models to stop using deprecated belongs_to method