Completed integration of default whitelist