Commandline interface improvements