added support for schoolyears