Handle return params properly