Changed belongs_to to the singular, and added helper methods from compilation