More thoughts on how to structure data