improved CommandSet