Add blacklist and more stuff