Added server class