Added some more stuff to entitymgr