Introduce a IFMapNodeLookup Helper and addressing some remarks

Change-Id: Id4eb64383b9b7d277a708b790a9d9e5dde650d57