Added more blacklisting features