Add better date support