Change to server impl