Commandline support added