Updated mock server