Added support for new entity update system