Updated addEntities()