Adding Obect Context Wrapper to Map Back. Fixing Mapping bug when using Parent List