Add initial date support (incomplete)