Upgrade to new DC_General API.