[PATCH 13/19] commands: Changing the internal structures