Federation improvements

See commits