Added reference_wildcard support