Add support indexing for the case where Commands are reused. (Complex
Command Graph)