Major changes to entity structure