Server side objects refactoring.