Improve holiday manager with 1.7 changes