Updated job source to be more generic and robust