enhanced type to string mapping in Entity