Make blacklist a bit more generic