Support for more date formats
Fixed case