add server-side support