Server-side improvements