[TASK] Use NormalizedParams with simplified arguments