Update command manager even more