Speed up work for clients / devices / jobs
Merge pull request #52 from marcfallowsbb/speed_up

Speed up work for clients / devices / jobs