Added type lookup implementation