Fixed wildcard and added rank