[WIP] fixed ActiveRecord models for updating relatede objects