[PATCH 03/10] Add extended command parsing