[PATCH v2 12/19] commands: Changing the internal structures