Add Reverse lookup [2/4]

Change-Id: Ic5d44c2873277adcfa8c104ad0a77bc2f68de903