Added fix for scheduleType being missing and