Move param value decoding to end