Added more template lookup implementation