Add ReadPreferences and full Query support