Continue lowering complexity of Schedule class