Changed imports in Entity