Added initial option parser