Merging lookup feature into master