Update for OC 1.2 and 1.3