Migrate to WS 2.5