Removed duplicate query builders