Adding riodesc/corefile mods to vapi