Wrapped servers so they are now classes