[PATCH] Add full command line parameter support