Added more control through commandline options