extractDate now Optional not nullable