Imlemented wildcard matching hence remove TODO