Better mock/WS management