Removed reliance on ScheduledCommand instance