Adding server wrapper