Add some CLI options