Made more amedments to the entities, making the subentities references instead of embedded objects.