adapt to changes in Server class