Added option parser