Adapt for new server