Adding UniMgr feature