Added better option parsing