Updated addEntities and working on Portals