Added support for multiple custom parameters - fix