Added school holiday support