Proper restructuring of entities.
Project changes.