Added Date support