FERM-29: Setting up to be more cron-able