Extracting interfaces for refactoring purposes.
Merged.