- Added ability to map properties in super classes