Server side refactoring #2