Updated data model, added insert query