Further improve the dates support library