Adapt to 19.1.0 and do refactoring.