Simplify test for enabled jobs
Use AbstractJob subclasses when buidling list of jobs