Manager management overhauled