updates for model and mapper