Added features to WITH-CHECKED-PARAMETERS