Add submix support