dump file refactor