Added Wish server side