Modified Parser to allow for non-standard user modes