Remember blacklist and some design changes