Add WhiteList, refactor BlackList related activity and service.