Added Embeded RidBag support
TypeMaper cleanup
Code Cleanup