Bug #2063 - Added blacklisting and moved logic to synchronizer