Added identity handling for lookups
Changed update logics