Added all non-static modulemgr functions