Added server classes