+ Changes due to entity refactoring