Switch to using an param object