This issue is to collect issues we may have with the current data model in preparation for 17/10 meeting