Add belongs_to and remove unused attributes method