Fixed Server class