Finished OPC refactoring/unification