Add better handling for parser options