CFY-352: Prefix resources - WIP