Added support for public holiday