Add hacks to make Server Generic