Add spec matching (wildcard based on element value)