Changed jobservice logic