Added support for user parameters; needs some improvement, but works.