Updated data model for 3 sets and tidied up