Engine updates, factory changes, entity manager