Add support for recent 4.0-only configurations