Added auto-terminate to workers