Added support for nested List, Map, and Options