updates to Nested model and mapper