Added in-hand date support