Feature/cfy 959 provider abstraction