Continue modularising Interface.