Added option parsing