Further changes in entitymgr