Updated named parameters to fit grammar