Moved to better data dumping model