Continue of refactoring.