Updated for changes to DataOutHandler