diff --git a/build.gradle b/build.gradle
index 9d934e30a..2b36ecff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,8 +49,8 @@ subprojects {
     }
   }
 
-  sourceCompatibility = "1.8"
-  targetCompatibility = "1.8"
+  sourceCompatibility = JavaVersion.VERSION_1_7
+  targetCompatibility = JavaVersion.VERSION_1_7
 
   dependencies {
 
diff --git a/samples/build.gradle b/samples/build.gradle
index 051ecbb66..b02ebb4da 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 apply plugin: 'de.fuerstenau.buildconfig'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
   implementation project(":services-geocoding")
diff --git a/services-directions/src/test/java/com/mapbox/api/directions/v5/models/RouteLegTest.java b/services-directions/src/test/java/com/mapbox/api/directions/v5/models/RouteLegTest.java
index 5aec1432f..5187454cb 100644
--- a/services-directions/src/test/java/com/mapbox/api/directions/v5/models/RouteLegTest.java
+++ b/services-directions/src/test/java/com/mapbox/api/directions/v5/models/RouteLegTest.java
@@ -71,6 +71,8 @@ public void testToFromJson1() {
       "heavy",
       "heavy");
 
+    List<LegStep> legSteps = new ArrayList<>();
+
     LegAnnotation annotation = LegAnnotation.builder()
       .congestion(new ArrayList<String>())
       .distance(distanceList)
@@ -84,7 +86,7 @@ public void testToFromJson1() {
       .distance(53.4)
       //.weight(14.3)
       .duration(14.3)
-      .steps(new ArrayList<>())
+      .steps(legSteps)
       .summary("")
       .build();
 
diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java
index 84b501457..b8d6a9714 100644
--- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java
+++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java
@@ -42,7 +42,7 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class CarmenFeature implements GeoJson, Serializable {
+public abstract class CarmenFeature extends GeoJson implements Serializable {
 
   private static final String TYPE = "Feature";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java b/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java
index 4f040a193..1651f109d 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/CoordinateContainer.java
@@ -8,7 +8,7 @@
  * @param <T> a generic allowing varying dimensions for each GeoJson geometry
  * @since 3.0.0
  */
-public interface CoordinateContainer<T> extends Geometry {
+public abstract class CoordinateContainer<T> extends Geometry {
 
   /**
    * the coordinates which define the geometry. Typically a list of points but for some geometry
@@ -17,5 +17,5 @@ public interface CoordinateContainer<T> extends Geometry {
    * @return the {@link Point}s which make up the coordinates defining the geometry
    * @since 3.0.0
    */
-  T coordinates();
+  public abstract T coordinates();
 }
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Feature.java b/services-geojson/src/main/java/com/mapbox/geojson/Feature.java
index d4853fbfa..69b9fa187 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/Feature.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/Feature.java
@@ -46,7 +46,7 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class Feature implements GeoJson {
+public abstract class Feature extends GeoJson {
 
   private static final String TYPE = "Feature";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java
index 341dfacd8..2ef022ee6 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java
@@ -37,7 +37,7 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class FeatureCollection implements GeoJson {
+public abstract class FeatureCollection extends GeoJson {
 
   private static final String TYPE = "FeatureCollection";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java b/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java
index e081e1c4f..1dd67f23b 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/GeoJson.java
@@ -7,7 +7,7 @@
  *
  * @since 1.0.0
  */
-public interface GeoJson {
+public abstract class GeoJson {
 
   /**
    * This describes the type of GeoJson geometry, Feature, or FeatureCollection this object is.
@@ -18,7 +18,7 @@ public interface GeoJson {
    *   {@code Feature}
    * @since 1.0.0
    */
-  String type();
+  public abstract String type();
 
   /**
    * This takes the currently defined values found inside the GeoJson instance and converts it to a
@@ -27,7 +27,7 @@ public interface GeoJson {
    * @return a JSON string which represents this Feature
    * @since 1.0.0
    */
-  String toJson();
+  public abstract String toJson();
 
   /**
    * A GeoJson object MAY have a member named "bbox" to include information on the coordinate range
@@ -40,5 +40,5 @@ public interface GeoJson {
    *   the contained geometries
    * @since 3.0.0
    */
-  BoundingBox bbox();
+  public abstract BoundingBox bbox();
 }
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java b/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java
index ce1f418a4..a529dee71 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/Geometry.java
@@ -13,7 +13,7 @@
  *
  * @since 1.0.0
  */
-public interface Geometry extends GeoJson {
+public abstract class Geometry extends GeoJson {
 
   /**
    * Create a new instance of this class by passing in a formatted valid JSON String.
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java
index 63cf7cc1d..cd077fc72 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java
@@ -61,7 +61,7 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class GeometryCollection implements Geometry, Serializable {
+public abstract class GeometryCollection extends Geometry implements Serializable {
 
   private static final String TYPE = "GeometryCollection";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/LineString.java b/services-geojson/src/main/java/com/mapbox/geojson/LineString.java
index d0280378d..b289673c8 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/LineString.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/LineString.java
@@ -51,7 +51,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class LineString implements CoordinateContainer<List<Point>>, Serializable {
+public abstract class LineString extends CoordinateContainer<List<Point>>
+  implements Serializable {
 
   private static final String TYPE = "LineString";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java
index 0505f88fe..94160a97e 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java
@@ -51,8 +51,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class MultiLineString
-  implements CoordinateContainer<List<List<Point>>>, Serializable {
+public abstract class MultiLineString extends CoordinateContainer<List<List<Point>>>
+  implements Serializable {
 
   private static final String TYPE = "MultiLineString";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java
index 8de336b83..7373d9a28 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiPoint.java
@@ -36,7 +36,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class MultiPoint implements CoordinateContainer<List<Point>>, Serializable {
+public abstract class MultiPoint extends CoordinateContainer<List<Point>>
+  implements Serializable {
 
   private static final String TYPE = "MultiPoint";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java
index 2eeb703c3..1e1f6aaf7 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java
@@ -69,8 +69,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class MultiPolygon
-  implements CoordinateContainer<List<List<List<Point>>>>, Serializable {
+public abstract class MultiPolygon extends CoordinateContainer<List<List<List<Point>>>>
+  implements Serializable {
 
   private static final String TYPE = "MultiPolygon";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Point.java b/services-geojson/src/main/java/com/mapbox/geojson/Point.java
index 9e070313a..b52ab1990 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/Point.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/Point.java
@@ -52,7 +52,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class Point implements CoordinateContainer<List<Double>>, Serializable {
+public abstract class Point extends CoordinateContainer<List<Double>>
+  implements Serializable {
 
   private static final String TYPE = "Point";
 
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java b/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java
index e0050efa4..ed214a7c0 100644
--- a/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java
+++ b/services-geojson/src/main/java/com/mapbox/geojson/Polygon.java
@@ -59,7 +59,8 @@
  * @since 1.0.0
  */
 @AutoValue
-public abstract class Polygon implements CoordinateContainer<List<List<Point>>>, Serializable {
+public abstract class Polygon extends CoordinateContainer<List<List<Point>>>
+  implements Serializable {
 
   private static final String TYPE = "Polygon";