Updates to support ranges and times before / after / equal to