Tentative support for maps & matrices
Clarified exception