Use new style subassistant loading