Updated to match new DataOutHandler