Remove the overstructure and use the manager to get the entities
Cleaned up warnings