diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index d5b2e177..942aa823 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -175,57 +175,70 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
         this.coordEndpoint = coordEndpoint;
     }
 
-    protected void setLanguage(final String language) {
+    protected AbstractEfaProvider setLanguage(final String language) {
         this.language = language;
+        return this;
     }
 
-    protected void setAdditionalQueryParameter(final String additionalQueryParameter) {
+    protected AbstractEfaProvider setAdditionalQueryParameter(final String additionalQueryParameter) {
         this.additionalQueryParameter = additionalQueryParameter;
+        return this;
     }
 
-    protected void setRequestUrlEncoding(final Charset requestUrlEncoding) {
+    protected AbstractEfaProvider setRequestUrlEncoding(final Charset requestUrlEncoding) {
         this.requestUrlEncoding = requestUrlEncoding;
+        return this;
     }
 
-    protected void setHttpReferer(final String httpReferer) {
+    protected AbstractEfaProvider setHttpReferer(final String httpReferer) {
         this.httpReferer = httpReferer;
         this.httpRefererTrip = httpReferer;
+        return this;
     }
 
-    public void setHttpRefererTrip(final String httpRefererTrip) {
+    public AbstractEfaProvider setHttpRefererTrip(final String httpRefererTrip) {
         this.httpRefererTrip = httpRefererTrip;
+        return this;
     }
 
-    protected void setHttpPost(final boolean httpPost) {
+    protected AbstractEfaProvider setHttpPost(final boolean httpPost) {
         this.httpPost = httpPost;
+        return this;
     }
 
-    protected void setIncludeRegionId(final boolean includeRegionId) {
+    protected AbstractEfaProvider setIncludeRegionId(final boolean includeRegionId) {
         this.includeRegionId = includeRegionId;
+        return this;
     }
 
-    protected void setUseProxFootSearch(final boolean useProxFootSearch) {
+    protected AbstractEfaProvider setUseProxFootSearch(final boolean useProxFootSearch) {
         this.useProxFootSearch = useProxFootSearch;
+        return this;
     }
 
-    protected void setUseRouteIndexAsTripId(final boolean useRouteIndexAsTripId) {
+    protected AbstractEfaProvider setUseRouteIndexAsTripId(final boolean useRouteIndexAsTripId) {
         this.useRouteIndexAsTripId = useRouteIndexAsTripId;
+        return this;
     }
 
-    protected void setUseLineRestriction(final boolean useLineRestriction) {
+    protected AbstractEfaProvider setUseLineRestriction(final boolean useLineRestriction) {
         this.useLineRestriction = useLineRestriction;
+        return this;
     }
 
-    protected void setUseStringCoordListOutputFormat(final boolean useStringCoordListOutputFormat) {
+    protected AbstractEfaProvider setUseStringCoordListOutputFormat(final boolean useStringCoordListOutputFormat) {
         this.useStringCoordListOutputFormat = useStringCoordListOutputFormat;
+        return this;
     }
 
-    protected void setNeedsSpEncId(final boolean needsSpEncId) {
+    protected AbstractEfaProvider setNeedsSpEncId(final boolean needsSpEncId) {
         this.needsSpEncId = needsSpEncId;
+        return this;
     }
 
-    protected void setFareCorrectionFactor(final float fareCorrectionFactor) {
+    protected AbstractEfaProvider setFareCorrectionFactor(final float fareCorrectionFactor) {
         this.fareCorrectionFactor = fareCorrectionFactor;
+        return this;
     }
 
     @Override
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index fa3e6ca0..02fb225d 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -218,72 +218,89 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
         this.productsMap = productsMap;
     }
 
-    protected void setStationBoardEndpoint(final String stationBoardEndpoint) {
+    protected AbstractHafasProvider setStationBoardEndpoint(final String stationBoardEndpoint) {
         this.stationBoardEndpoint = stationBoardEndpoint;
+        return this;
     }
 
-    protected void setGetStopEndpoint(final String getStopEndpoint) {
+    protected AbstractHafasProvider setGetStopEndpoint(final String getStopEndpoint) {
         this.getStopEndpoint = getStopEndpoint;
+        return this;
     }
 
-    protected void setQueryEndpoint(final String queryEndpoint) {
+    protected AbstractHafasProvider setQueryEndpoint(final String queryEndpoint) {
         this.queryEndpoint = queryEndpoint;
+        return this;
     }
 
-    protected void setExtXmlEndpoint(final String extXmlEndpoint) {
+    protected AbstractHafasProvider setExtXmlEndpoint(final String extXmlEndpoint) {
         this.extXmlEndpoint = extXmlEndpoint;
+        return this;
     }
 
-    protected void setAccessId(final String accessId) {
+    protected AbstractHafasProvider setAccessId(final String accessId) {
         this.accessId = accessId;
+        return this;
     }
 
-    protected void setClientType(final String clientType) {
+    protected AbstractHafasProvider setClientType(final String clientType) {
         this.clientType = clientType;
+        return this;
     }
 
-    protected void setJsonApiVersion(final String jsonApiVersion) {
+    protected AbstractHafasProvider setJsonApiVersion(final String jsonApiVersion) {
         this.jsonApiVersion = jsonApiVersion;
+        return this;
     }
 
-    protected void setJsonApiAuthorization(final String jsonApiAuthorization) {
+    protected AbstractHafasProvider setJsonApiAuthorization(final String jsonApiAuthorization) {
         this.jsonApiAuthorization = jsonApiAuthorization;
+        return this;
     }
 
-    protected void setJsonApiClient(final String jsonApiClient) {
+    protected AbstractHafasProvider setJsonApiClient(final String jsonApiClient) {
         this.jsonApiClient = jsonApiClient;
+        return this;
     }
 
-    protected void setDominantPlanStopTime(final boolean dominantPlanStopTime) {
+    protected AbstractHafasProvider setDominantPlanStopTime(final boolean dominantPlanStopTime) {
         this.dominantPlanStopTime = dominantPlanStopTime;
+        return this;
     }
 
-    protected void setJsonGetStopsEncoding(final Charset jsonGetStopsEncoding) {
+    protected AbstractHafasProvider setJsonGetStopsEncoding(final Charset jsonGetStopsEncoding) {
         this.jsonGetStopsEncoding = jsonGetStopsEncoding;
+        return this;
     }
 
-    protected void setJsonGetStopsUseWeight(final boolean jsonGetStopsUseWeight) {
+    protected AbstractHafasProvider setJsonGetStopsUseWeight(final boolean jsonGetStopsUseWeight) {
         this.jsonGetStopsUseWeight = jsonGetStopsUseWeight;
+        return this;
     }
 
-    protected void setJsonNearbyLocationsEncoding(final Charset jsonNearbyLocationsEncoding) {
+    protected AbstractHafasProvider setJsonNearbyLocationsEncoding(final Charset jsonNearbyLocationsEncoding) {
         this.jsonNearbyLocationsEncoding = jsonNearbyLocationsEncoding;
+        return this;
     }
 
-    protected void setUseIso8601(final boolean useIso8601) {
+    protected AbstractHafasProvider setUseIso8601(final boolean useIso8601) {
         this.useIso8601 = useIso8601;
+        return this;
     }
 
-    protected void setStationBoardHasStationTable(final boolean stationBoardHasStationTable) {
+    protected AbstractHafasProvider setStationBoardHasStationTable(final boolean stationBoardHasStationTable) {
         this.stationBoardHasStationTable = stationBoardHasStationTable;
+        return this;
     }
 
-    protected void setStationBoardHasLocation(final boolean stationBoardHasLocation) {
+    protected AbstractHafasProvider setStationBoardHasLocation(final boolean stationBoardHasLocation) {
         this.stationBoardHasLocation = stationBoardHasLocation;
+        return this;
     }
 
-    protected void setStationBoardCanDoEquivs(final boolean canDoEquivs) {
+    protected AbstractHafasProvider setStationBoardCanDoEquivs(final boolean canDoEquivs) {
         this.stationBoardCanDoEquivs = canDoEquivs;
+        return this;
     }
 
     @Override
@@ -3125,8 +3142,9 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider {
         }
     }
 
-    protected void setHtmlNearbyStationsPattern(final Pattern htmlNearbyStationsPattern) {
+    protected AbstractHafasProvider setHtmlNearbyStationsPattern(final Pattern htmlNearbyStationsPattern) {
         this.htmlNearbyStationsPattern = htmlNearbyStationsPattern;
+        return this;
     }
 
     private Pattern htmlNearbyStationsPattern = Pattern.compile("<tr class=\"(zebra[^\"]*)\">(.*?)</tr>",
diff --git a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java b/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
index 403cecf7..33373adf 100644
--- a/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
@@ -75,28 +75,34 @@ public abstract class AbstractNetworkProvider implements NetworkProvider {
         return ALL_EXCEPT_HIGHSPEED;
     }
 
-    public void setUserAgent(final String userAgent) {
+    public AbstractNetworkProvider setUserAgent(final String userAgent) {
         httpClient.setUserAgent(userAgent);
+        return this;
     }
 
-    public void setProxy(final Proxy proxy) {
+    public AbstractNetworkProvider setProxy(final Proxy proxy) {
         httpClient.setProxy(proxy);
+        return this;
     }
 
-    protected void setTimeZone(final String timeZoneId) {
+    protected AbstractNetworkProvider setTimeZone(final String timeZoneId) {
         this.timeZone = TimeZone.getTimeZone(timeZoneId);
+        return this;
     }
 
-    protected void setNumTripsRequested(final int numTripsRequested) {
+    protected AbstractNetworkProvider setNumTripsRequested(final int numTripsRequested) {
         this.numTripsRequested = numTripsRequested;
+        return this;
     }
 
-    protected void setStyles(final Map<String, Style> styles) {
+    protected AbstractNetworkProvider setStyles(final Map<String, Style> styles) {
         this.styles = styles;
+        return this;
     }
 
-    protected void setSessionCookieName(final String sessionCookieName) {
+    protected AbstractNetworkProvider setSessionCookieName(final String sessionCookieName) {
         httpClient.setSessionCookieName(sessionCookieName);
+        return this;
     }
 
     private static final char STYLES_SEP = '|';