0.1.0 whitelist and structured matching