Added date query support