Keep the original public interface of the server side the same in refactoring.