Rework Plugin Architecture and WS-Federation Plugin