Tweaked the way params are handled