Add Blacklist.type and code cleanup