Added commanline parameters for scripting