Federation API improvements