Added commandline handler