Handle Lists and Maps (#762)

5 files changed