Support for List and Map

fair enough :(