fixed entities to work with the new mapping