Improved support for multiple date formats