Update with CustOps changes