Updated with core Schedule class fix