Fix manager to work with defined args