[PATCH 4/7] Add extended command parsing