Refine/OC import template improvements