[PATCH 04/11] Add extended command parsing