Fixed mapping in Entity