DataAccess: Update for query builder
Core: Adapted model class to 2.0