Improvements to federation API