Adding white/blacklisting

Change-Id: I0f209e677aaa10d717d166646088ab6d2dd53246