Updated donut to support date queries