Refactored endpoint blacklist and Other aggregate category to be more functional