Server side refactoring #1