Refine code for OOF-VFC interaction