Improvements to schedule files and conflict detection