update on rake task, models and relations