#17 #18 - Encapsulate and fix scheduled jobs and use interval settings