Updated for refactored DataOutHandler