Removal of the Enumerator and added it to the EntityGuard class.