debug: Refactored DataModel debug