Upgraded params logic