Merge "Update shema for VFC"