Server Side Refactor