Integrated list map mapping to mapper.
Added builder tests.