Slight changes in the param handling