Updated for changes in the CSPOM API