Upgrade of the query builder decorator mechanism