DataQueries implemented and some changes in the data model