Updated for wildcard use being feature-flagged in 0.9-pre