Adding commandline support ;