Refactored Server