Refine to OC import interfaces

Still a work in progress...