Better support for gap years