Add support for wild-card magic