Blacklist support [3/6]

Change-Id: I4fdee513bd6fc5ce04f7a14678c2ce5ce984bede