added server fields and models