Finish integration of the params marshalling