Make server prototypes more similar