Fix managers to use BaseEntityManager

Fix managers

Fix managers