Small changes in jobs classes