Add back server class accidentally deleted