Removed QueryBuilder; improvements