Added CommandIterator stuff