Changes to reflect the new CSPOM API