Added paramset wrapper class