Moving classes and adding information to WS class