Refactor the interface.