Add Commandline support