Convert entities into mapped-superclass
Merge pull request #262 from winzou/fix-mapping

Convert entities into mapped-superclass