CLI options added and working.