Initial support for command line