Entity manager expansion