Feature/cron updates