Updated parsing of program options