added Query Support