Add Lookup module, further optimization