Changed blacklist handling