Refactoring related changes.