improve Command.class