updates to support nesting maps