Added cmd-line params for standalone run