Added those missing belongs_to