Convert InvManagement from static to instance