Several changes to the parameter classes