Added lookup feature