Refactored blacklist mechanism