Updated the entities to all have a common parent