Added another map-backed option.  No time to test on the system where
the other tests were executed now
Cleaning up conflicts