classes Map and MapExceptions updated