Updated for new DataOutHandler structure