Added date keywords support.