Refactoring of the entity management code complete.