added a bit more date support