updated data model 26-09-2014