Improve Date support