More work on schedule class