Query builder added