Refine/OC import interface improvements