Refactored Query builders