adds support for optional dates