[NUCCORE-1260] Add Maps to supported types