Refactored Server Software