Improved parameter support