Add support for Maps to verifier