[IMP] Convert code to V7