Added support for Entity refresh