Black white list improved