Upgrade of the query builder decorator mechanism
Upgrade of the query builder decorator mechanism