Add Map and SuperClass in Entity