Command Manager improvement