Made changes to fix endless loop by adding the lists after the identy
map.  Also added identity map.