Refine undefined params handling