Switch to new destructure wildcard format