Rewrite OC support