SSP-1145 , SSP-1146 Data and Object model enhancements for MAP Phase 2