added server class to data model