data model changed
query functions added