Improve dataset structure