Fix entity field import