add holiday and day of week support