Changed parsing of options