Enhanced the black list system