Add the Query Support