Add backcompat layer to Server