Improving server-side support