WMPL support changes.