Rework interface to be in Command component.