Add Reverse lookup [3/4]

Change-Id: Iddbceef72582bc358ca177362806ee291a4aacce