Refactor to new interface.
Refactor the interfaces again.