Added further structure, modified data model