Implement new options in command line script AT-408