Various changes to support the new params