Adding federation support