Improving the holidays functionality