Added CLI options