Add support for Date -- Related to #18