Added more CLI options