Finalizing wildcard support