Some server classes added