Changes to handling params