Add Reverse lookup [4/4]

Change-Id: Id34a2ff09ddf7f0ee0b893a6db46e556fb545632