server classes corrected