Adding multi-value date support