Updated query builders.