Server-side refactoring