Added inital option parsing