added custom parameter support