refactor model dump