Added support for List and Maps.