Refactoring
Refactor the interface.