Server class added