Server side refactoring