Changes to the way input params are handled