command manager improved