Collapse into a single interface/client model