Improve implementation of command data (#2258)* Improve implementation of command data* Add remove operations* Update some documentation for options (commit: 993c877)