diff --git a/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotation.java
new file mode 100644
index 00000000..fdcc2be4
--- /dev/null
+++ b/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.dexlib2.base;
+
+import org.jf.dexlib2.iface.Annotation;
+import org.jf.dexlib2.iface.AnnotationElement;
+
+import javax.annotation.Nonnull;
+
+public abstract class BaseAnnotation implements Annotation {
+    @Override
+    public int hashCode() {
+        return hashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o != null && o instanceof Annotation) {
+            return equals(this, (Annotation)o);
+        }
+        return false;
+    }
+
+    public static int hashCode(@Nonnull Annotation annotation) {
+        int hashCode = annotation.getVisibility();
+        hashCode = hashCode*31 + annotation.getType().hashCode();
+        for (AnnotationElement element: annotation.getElements()) {
+            hashCode = hashCode*31 + element.hashCode();
+        }
+        return hashCode;
+    }
+
+    public static boolean equals(@Nonnull Annotation annotation1, @Nonnull Annotation annotation2) {
+        return (annotation1.getVisibility() == annotation2.getVisibility()) &&
+                annotation1.getType().equals(annotation2.getType()) &&
+                annotation1.getElements().equals(annotation2.getElements());
+    }
+}
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotationElement.java b/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotationElement.java
new file mode 100644
index 00000000..d81d5f43
--- /dev/null
+++ b/dexlib2/src/main/java/org/jf/dexlib2/base/BaseAnnotationElement.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2012, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.dexlib2.base;
+
+import org.jf.dexlib2.iface.AnnotationElement;
+
+public abstract class BaseAnnotationElement implements AnnotationElement {
+    @Override
+    public int hashCode() {
+        int hashCode = getName().hashCode();
+        return hashCode*31 + getValue().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o != null && o instanceof AnnotationElement) {
+            AnnotationElement other = (AnnotationElement)o;
+            return getName().equals(other.getName()) &&
+                   getValue().equals(other.getValue());
+        }
+        return false;
+    }
+}
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java
index 4de3c729..20e413ed 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java
@@ -31,13 +31,13 @@
 
 package org.jf.dexlib2.dexbacked;
 
+import org.jf.dexlib2.base.BaseAnnotation;
 import org.jf.dexlib2.dexbacked.util.VariableSizeCollection;
-import org.jf.dexlib2.iface.Annotation;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
 
-public class DexBackedAnnotation implements Annotation {
+public class DexBackedAnnotation extends BaseAnnotation {
     @Nonnull public final DexBuffer dexBuf;
 
     public final int visibility;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java
index 989da785..9dbcc97c 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java
@@ -31,13 +31,13 @@
 
 package org.jf.dexlib2.dexbacked;
 
+import org.jf.dexlib2.base.BaseAnnotationElement;
 import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue;
-import org.jf.dexlib2.iface.AnnotationElement;
 import org.jf.dexlib2.iface.value.EncodedValue;
 
 import javax.annotation.Nonnull;
 
-public class DexBackedAnnotationElement implements AnnotationElement {
+public class DexBackedAnnotationElement extends BaseAnnotationElement {
     @Nonnull private final DexBuffer dexBuffer;
     public final int nameIndex;
     @Nonnull public final EncodedValue value;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotation.java
index d88e638d..ce4dc4d9 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotation.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotation.java
@@ -32,6 +32,7 @@
 package org.jf.dexlib2.immutable;
 
 import com.google.common.collect.ImmutableList;
+import org.jf.dexlib2.base.BaseAnnotation;
 import org.jf.dexlib2.iface.Annotation;
 import org.jf.dexlib2.iface.AnnotationElement;
 import org.jf.util.ImmutableListConverter;
@@ -41,7 +42,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Collection;
 
-public class ImmutableAnnotation implements Annotation {
+public class ImmutableAnnotation extends BaseAnnotation {
     public final int visibility;
     @Nonnull public final String type;
     @Nonnull public final ImmutableList<? extends ImmutableAnnotationElement> elements;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotationElement.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotationElement.java
index 578f0164..40f48e1e 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotationElement.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableAnnotationElement.java
@@ -32,6 +32,7 @@
 package org.jf.dexlib2.immutable;
 
 import com.google.common.collect.ImmutableList;
+import org.jf.dexlib2.base.BaseAnnotationElement;
 import org.jf.dexlib2.iface.AnnotationElement;
 import org.jf.dexlib2.iface.value.EncodedValue;
 import org.jf.dexlib2.immutable.value.ImmutableEncodedValue;
@@ -40,9 +41,8 @@ import org.jf.util.ImmutableListConverter;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.List;
 
-public class ImmutableAnnotationElement implements AnnotationElement {
+public class ImmutableAnnotationElement extends BaseAnnotationElement {
     @Nonnull public final String name;
     @Nonnull public final ImmutableEncodedValue value;