Server side refactoring #3