This probably belongs in the container now as well. Not really related to scheduling.