diff --git a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntitiesStep.java b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntitiesStep.java
index 66d9f17..f942101 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntitiesStep.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntitiesStep.java
@@ -25,11 +25,9 @@
  * </pre>
  */
 
-@XmlType(name = "propEntitiesStep", propOrder = {
-        "step"
-})
 public class PropEntitiesStep {
 
+    @Key("step")
     public List<PropEntityStep> step;
     @Key("count")
     public Integer count;
diff --git a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntity.java b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntity.java
index e19ae28..c1622b8 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntity.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntity.java
@@ -28,9 +28,6 @@
  * </pre>
  */
 
-@XmlType(name = "propEntity", propOrder = {
-        "properties"
-})
 @XmlSeeAlso({
         PropEntityFeature.class,
         PropEntityArtifactDep.class,
@@ -41,6 +38,7 @@
 })
 public class PropEntity {
 
+  @Key("properties")
     public Properties properties;
     @Key("id")
     public String id;
diff --git a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntityStep.java b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntityStep.java
index 4f88de3..120fb33 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/model/PropEntityStep.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/model/PropEntityStep.java
@@ -19,9 +19,5 @@
  * </pre>
  */
 
-@XmlType(name = "propEntityStep")
-public class PropEntityStep
-        extends PropEntity {
-
-
+public class PropEntityStep extends PropEntity {
 }
diff --git a/src/main/java/jetbrains/teamcity/rest/client/model/VcsRootRef.java b/src/main/java/jetbrains/teamcity/rest/client/model/VcsRootRef.java
index 5335347..708cc8d 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/model/VcsRootRef.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/model/VcsRootRef.java
@@ -40,4 +40,10 @@ public class VcsRootRef {
     @Key("locator")
     public String locator;
 
+  public VcsRootRef() {
+  }
+
+  public VcsRootRef(String id) {
+    this.id = id;
+  }
 }
diff --git a/src/main/java/jetbrains/teamcity/rest/client/resources/BuildTypesResource.java b/src/main/java/jetbrains/teamcity/rest/client/resources/BuildTypesResource.java
index a0295c1..7414a75 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/resources/BuildTypesResource.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/resources/BuildTypesResource.java
@@ -4,6 +4,8 @@
 package jetbrains.teamcity.rest.client.resources;
 
 import jetbrains.teamcity.rest.client.model.BuildType;
+import jetbrains.teamcity.rest.client.model.PropEntityStep;
+import jetbrains.teamcity.rest.client.model.VcsRootEntry;
 import org.jetbrains.annotations.NotNull;
 
 import javax.ws.rs.*;
@@ -24,485 +26,485 @@ public interface BuildTypesResource {
     @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/agent-requirements")
-    Response getAgentRequirements(@PathParam("btLocator") String btLocator);
+    Response getAgentRequirements(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/agent-requirements")
-    Response addAgentRequirement(@PathParam("btLocator") String btLocator);
+  Response addAgentRequirement(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/agent-requirements")
-    Response replaceAgentRequirements(@PathParam("btLocator") String btLocator);
+  Response replaceAgentRequirements(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes("*/*")
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features")
-    Response addFeature(@PathParam("btLocator") String btLocator);
+  Response addFeature(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features")
-    Response getFeatures(@PathParam("btLocator") String btLocator);
+  Response getFeatures(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features")
-    Response replaceFeatures(@PathParam("btLocator") String btLocator);
+  Response replaceFeatures(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/snapshot-dependencies/{snapshotDepLocator}")
-    Response getSnapshotDep(@PathParam("btLocator") String btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
+  Response getSnapshotDep(@PathParam("btLocator") Locator btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/snapshot-dependencies/{snapshotDepLocator}")
-    void deleteSnapshotDep(@PathParam("btLocator") String btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
+  void deleteSnapshotDep(@PathParam("btLocator") Locator btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/snapshot-dependencies/{snapshotDepLocator}")
-    Response replaceSnapshotDep(@PathParam("btLocator") String btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
+  Response replaceSnapshotDep(@PathParam("btLocator") Locator btLocator, @PathParam("snapshotDepLocator") String snapshotDepLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-entries/{id}")
-    Response getVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") String btLocator);
+  Response getVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-entries/{id}")
-    Response updateVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") String btLocator);
+  Response updateVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") Locator btLocator);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/vcs-root-entries/{id}")
-    void deleteVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") String btLocator);
+  void deleteVcsRootEntry(@PathParam("id") String id, @PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/artifact-dependencies/{artifactDepLocator}")
-    Response getArtifactDep(@PathParam("btLocator") String btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
+  Response getArtifactDep(@PathParam("btLocator") Locator btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/artifact-dependencies/{artifactDepLocator}")
-    void deleteArtifactDep(@PathParam("btLocator") String btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
+  void deleteArtifactDep(@PathParam("btLocator") Locator btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
 
-    @PUT
+  @PUT
     @Consumes("*/*")
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/artifact-dependencies/{artifactDepLocator}")
-    Response replaceArtifactDep(@PathParam("btLocator") String btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
+  Response replaceArtifactDep(@PathParam("btLocator") Locator btLocator, @PathParam("artifactDepLocator") String artifactDepLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/triggers/{triggerLocator}")
-    Response getTrigger(@PathParam("btLocator") String btLocator, @PathParam("triggerLocator") String triggerLocator);
+  Response getTrigger(@PathParam("btLocator") Locator btLocator, @PathParam("triggerLocator") String triggerLocator);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/triggers/{triggerLocator}")
-    void deleteTrigger(@PathParam("btLocator") String btLocator, @PathParam("triggerLocator") String triggerLocator);
+  void deleteTrigger(@PathParam("btLocator") Locator btLocator, @PathParam("triggerLocator") String triggerLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/triggers/{triggerLocator}")
-    Response replaceTrigger(@PathParam("btLocator") String btLocator, @PathParam("triggerLocator") String triggerLocator);
+  Response replaceTrigger(@PathParam("btLocator") Locator btLocator, @PathParam("triggerLocator") String triggerLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/agent-requirements/{agentRequirementLocator}")
-    Response getAgentRequirement(@PathParam("btLocator") String btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
+  Response getAgentRequirement(@PathParam("btLocator") Locator btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/agent-requirements/{agentRequirementLocator}")
-    void deleteAgentRequirement(@PathParam("btLocator") String btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
+  void deleteAgentRequirement(@PathParam("btLocator") Locator btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/agent-requirements/{agentRequirementLocator}")
-    Response replaceAgentRequirement(@PathParam("btLocator") String btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
+  Response replaceAgentRequirement(@PathParam("btLocator") Locator btLocator, @PathParam("agentRequirementLocator") String agentRequirementLocator);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/parameters/{name}")
-    Response setParameterValue(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  Response setParameterValue(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/parameters/{name}")
-    Response getParameterValue(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  Response getParameterValue(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/parameters/{name}")
-    Response getParameter(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  Response getParameter(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/parameters/{name}")
-    void deleteBuildTypeParameter(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  void deleteBuildTypeParameter(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/triggers")
-    Response getTriggers(@PathParam("btLocator") String btLocator);
+  Response getTriggers(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/triggers")
-    Response addTrigger(@PathParam("btLocator") String btLocator);
+  Response addTrigger(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/triggers")
-    Response replaceTriggers(@PathParam("btLocator") String btLocator);
+  Response replaceTriggers(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps")
-    Response addStep(@PathParam("btLocator") String btLocator);
+  Response addStep(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps")
-    Response getSteps(@PathParam("btLocator") String btLocator);
+  Response getSteps(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps")
-    Response replaceSteps(@PathParam("btLocator") String btLocator);
+  Response replaceSteps(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/investigations")
-    Response getInvestigations(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response getInvestigations(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-entries")
-    Response getVcsRootEntries(@PathParam("btLocator") String btLocator);
+  Response getVcsRootEntries(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-entries")
-    Response replaceVcsRootEntries(@PathParam("btLocator") String btLocator);
+  Response replaceVcsRootEntries(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-entries")
-    Response addVcsRootEntry(@PathParam("btLocator") String btLocator);
+  VcsRootEntry addVcsRootEntry(@NotNull VcsRootEntry entry, @PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps/{stepId}")
-    Response getStep(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId);
+  PropEntityStep getStep(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/steps/{stepId}")
-    void deleteStep(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId);
+  void deleteStep(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps/{stepId}")
-    Response replaceStep(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId);
+  Response replaceStep(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps/{stepId}/parameters")
-    Response getStepParameters(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId);
+  Response getStepParameters(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/steps/{stepId}/parameters")
-    Response replaceStepParameters(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId);
+  Response replaceStepParameters(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/steps/{stepId}/parameters/{parameterName}")
-    Response getStepParameter(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId, @PathParam("parameterName") String parameterName);
+  Response getStepParameter(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId, @PathParam("parameterName") String parameterName);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/steps/{stepId}/parameters/{parameterName}")
-    Response addStepParameter(@PathParam("btLocator") String btLocator, @PathParam("stepId") String stepId, @PathParam("parameterName") String parameterName);
+  Response addStepParameter(@PathParam("btLocator") Locator btLocator, @PathParam("stepId") String stepId, @PathParam("parameterName") String parameterName);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/steps/{stepId}/{fieldName}")
-    Response getStepSetting(@PathParam("btLocator") String btLocator, @PathParam("fieldName") String fieldName, @PathParam("stepId") String stepId);
+  Response getStepSetting(@PathParam("btLocator") Locator btLocator, @PathParam("fieldName") String fieldName, @PathParam("stepId") String stepId);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/steps/{stepId}/{fieldName}")
-    Response changeStepSetting(@PathParam("btLocator") String btLocator, @PathParam("fieldName") String fieldName, @PathParam("stepId") String stepId);
+  Response changeStepSetting(@PathParam("btLocator") Locator btLocator, @PathParam("fieldName") String fieldName, @PathParam("stepId") String stepId);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/features/{featureId}")
-    void deleteFeature(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId);
+  void deleteFeature(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId);
 
-    @PUT
+  @PUT
     @Consumes("*/*")
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features/{featureId}")
-    Response replaceFeature(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId);
+  Response replaceFeature(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features/{featureId}")
-    Response getFeature(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId);
+  Response getFeature(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features/{featureId}/parameters")
-    Response getFeatureParameters(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId);
+  Response getFeatureParameters(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/features/{featureId}/parameters")
-    Response replaceFeatureParameters(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId);
+  Response replaceFeatureParameters(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/features/{featureId}/parameters/{parameterName}")
-    Response getFeatureParameter(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId, @PathParam("parameterName") String parameterName);
+  Response getFeatureParameter(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId, @PathParam("parameterName") String parameterName);
 
-    @PUT
+  @PUT
     @Consumes("*/*")
     @Produces("text/plain")
     @Path("/{btLocator}/features/{featureId}/parameters/{parameterName}")
-    Response addFeatureParameter(@PathParam("btLocator") String btLocator, @PathParam("featureId") String featureId, @PathParam("parameterName") String parameterName);
+  Response addFeatureParameter(@PathParam("btLocator") Locator btLocator, @PathParam("featureId") String featureId, @PathParam("parameterName") String parameterName);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/features/{featureId}/{name}")
-    Response getFeatureSetting(@PathParam("btLocator") String btLocator, @PathParam("name") String name, @PathParam("featureId") String featureId);
+  Response getFeatureSetting(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name, @PathParam("featureId") String featureId);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/features/{featureId}/{name}")
-    Response changeFeatureSetting(@PathParam("btLocator") String btLocator, @PathParam("name") String name, @PathParam("featureId") String featureId);
+  Response changeFeatureSetting(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name, @PathParam("featureId") String featureId);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/artifact-dependencies")
-    Response getArtifactDeps(@PathParam("btLocator") String btLocator);
+  Response getArtifactDeps(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/artifact-dependencies")
-    Response replaceArtifactDeps(@PathParam("btLocator") String btLocator);
+  Response replaceArtifactDeps(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes("*/*")
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/artifact-dependencies")
-    Response addArtifactDep(@PathParam("btLocator") String btLocator);
+  Response addArtifactDep(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/snapshot-dependencies")
-    Response getSnapshotDeps(@PathParam("btLocator") String btLocator);
+  Response getSnapshotDeps(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/snapshot-dependencies")
-    Response replaceSnapshotDeps(@PathParam("btLocator") String btLocator);
+  Response replaceSnapshotDeps(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/snapshot-dependencies")
-    Response addSnapshotDep(@PathParam("btLocator") String btLocator);
+  Response addSnapshotDep(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/triggers/{triggerLocator}/{fieldName}")
-    Response getTriggerSetting(@PathParam("btLocator") String btLocator, @PathParam("triggerLocator") String triggerLocator, @PathParam("fieldName") String fieldName);
+  Response getTriggerSetting(@PathParam("btLocator") Locator btLocator, @PathParam("triggerLocator") String triggerLocator, @PathParam("fieldName") String fieldName);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/triggers/{triggerLocator}/{fieldName}")
-    Response changeTriggerSetting(@PathParam("btLocator") String btLocator, @PathParam("triggerLocator") String triggerLocator, @PathParam("fieldName") String fieldName);
+  Response changeTriggerSetting(@PathParam("btLocator") Locator btLocator, @PathParam("triggerLocator") String triggerLocator, @PathParam("fieldName") String fieldName);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcsLabeling")
-    Response getVCSLabelingOptions(@PathParam("btLocator") String btLocator);
+  Response getVCSLabelingOptions(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcsLabeling")
-    Response setVCSLabelingOptions(@PathParam("btLocator") String btLocator);
+  Response setVCSLabelingOptions(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces("*/*")
     @Path("/{btLocator}/vcs/files/latest/content{path:(/.*)?}")
-    Response getVcsFileContent(@PathParam("btLocator") String btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
+  Response getVcsFileContent(@PathParam("btLocator") Locator btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs/files/latest/children{path:(/.*)?}")
-    Response getVcsFileListing(@PathParam("btLocator") String btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
+  Response getVcsFileListing(@PathParam("btLocator") Locator btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs/files/latest/metadata{path:(/.*)?}")
-    Response getVcsFile(@PathParam("btLocator") String btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
+  Response getVcsFile(@PathParam("btLocator") Locator btLocator, @PathParam("path") String path, @QueryParam("resolveParameters") Boolean resolveParameters);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/newBuildTypeDescription")
-    Response getExampleNewProjectDescriptionCompatibilityVersion1(@PathParam("btLocator") String btLocator);
+  Response getExampleNewProjectDescriptionCompatibilityVersion1(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/example/newBuildTypeDescription")
-    Response getExampleNewProjectDescription(@PathParam("btLocator") String btLocator);
+  Response getExampleNewProjectDescription(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/vcs-root-instances")
-    Response getCurrentVcsInstances(@PathParam("btLocator") String btLocator);
+  Response getCurrentVcsInstances(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/builds")
-    Response serveBuilds(@PathParam("btLocator") String btLocator, @QueryParam("status") String status, @QueryParam("triggeredByUser") String triggeredByUser, @QueryParam("includePersonal") Boolean includePersonal, 
-                @QueryParam("includeCanceled") Boolean includeCanceled, @QueryParam("onlyPinned") Boolean onlyPinned, @QueryParam("tag") String tag, @QueryParam("agentName") String agentName, 
+  Response serveBuilds(@PathParam("btLocator") Locator btLocator, @QueryParam("status") String status, @QueryParam("triggeredByUser") String triggeredByUser, @QueryParam("includePersonal") Boolean includePersonal,
+                       @QueryParam("includeCanceled") Boolean includeCanceled, @QueryParam("onlyPinned") Boolean onlyPinned, @QueryParam("tag") String tag, @QueryParam("agentName") String agentName,
                 @QueryParam("sinceBuild") String sinceBuild, @QueryParam("sinceDate") String sinceDate, @QueryParam("start") Long start, @QueryParam("count") Integer count, 
                 @QueryParam("locator") String locator, @QueryParam("fields") String fields);
 
     @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/builds/{buildLocator}")
-    Response serveBuildWithProject(@PathParam("btLocator") String btLocator, @PathParam("buildLocator") String buildLocator, @QueryParam("fields") String fields);
+    Response serveBuildWithProject(@PathParam("btLocator") Locator btLocator, @PathParam("buildLocator") String buildLocator, @QueryParam("fields") String fields);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/builds/{buildLocator}/{field}")
-    Response serveBuildField(@PathParam("field") String field, @PathParam("btLocator") String btLocator, @PathParam("buildLocator") String buildLocator);
+  Response serveBuildField(@PathParam("field") String field, @PathParam("btLocator") Locator btLocator, @PathParam("buildLocator") String buildLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/branches")
-    Response serveBranches(@PathParam("btLocator") String btLocator, @QueryParam("locator") String locator);
+  Response serveBranches(@PathParam("btLocator") Locator btLocator, @QueryParam("locator") String locator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}")
-    Response serveBuildTypeXML(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response serveBuildTypeXML(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}")
-    void deleteBuildType(@PathParam("btLocator") String btLocator);
+  void deleteBuildType(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/{field}")
-    Response serveBuildTypeField(@PathParam("field") String field, @PathParam("btLocator") String btLocator);
+  Response serveBuildTypeField(@PathParam("field") String field, @PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/{field}")
-    Response setBuildTypeField(@PathParam("field") String field, @PathParam("btLocator") String btLocator);
+  Response setBuildTypeField(@PathParam("field") String field, @PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/buildTags")
-    Response serveBuildTypeBuildsTags(@PathParam("btLocator") String btLocator);
+  Response serveBuildTypeBuildsTags(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/parameters")
-    Response serveBuildTypeParameters(@PathParam("btLocator") String btLocator, @QueryParam("locator") String locator, @QueryParam("fields") String fields);
+  Response serveBuildTypeParameters(@PathParam("btLocator") Locator btLocator, @QueryParam("locator") String locator, @QueryParam("fields") String fields);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/parameters")
-    Response changeBuildTypeParameters(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response changeBuildTypeParameters(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/parameters")
-    void deleteAllBuildTypeParameters(@PathParam("btLocator") String btLocator);
+  void deleteAllBuildTypeParameters(@PathParam("btLocator") Locator btLocator);
 
-    @POST
+  @POST
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/parameters")
-    Response setParameter(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response setParameter(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/settings")
-    Response serveBuildTypeSettings(@PathParam("btLocator") String btLocator);
+  Response serveBuildTypeSettings(@PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes({"application/xml", "application/json" })
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/settings")
-    Response replaceBuildTypeSettings(@PathParam("btLocator") String btLocator);
+  Response replaceBuildTypeSettings(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/settings/{name}")
-    Response serveBuildTypeSettings(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  Response serveBuildTypeSettings(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @PUT
+  @PUT
     @Consumes("*/*")
     @Produces("text/plain")
     @Path("/{btLocator}/settings/{name}")
-    Response putBuildTypeSetting(@PathParam("btLocator") String btLocator, @PathParam("name") String name);
+  Response putBuildTypeSetting(@PathParam("btLocator") Locator btLocator, @PathParam("name") String name);
 
-    @GET
+  @GET
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/template")
-    Response serveBuildTypeTemplate(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response serveBuildTypeTemplate(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces({"application/xml", "application/json" })
     @Path("/{btLocator}/template")
-    Response getTemplateAssociation(@PathParam("btLocator") String btLocator, @QueryParam("fields") String fields);
+  Response getTemplateAssociation(@PathParam("btLocator") Locator btLocator, @QueryParam("fields") String fields);
 
-    @DELETE
+  @DELETE
     @Path("/{btLocator}/template")
-    void deleteTemplateAssociation(@PathParam("btLocator") String btLocator);
+  void deleteTemplateAssociation(@PathParam("btLocator") Locator btLocator);
 
-    @GET
+  @GET
     @Produces("text/plain")
     @Path("/{btLocator}/vcs-root-entries/{id}/checkout-rules")
-    Response getVcsRootEntryCheckoutRules(@PathParam("id") String id, @PathParam("btLocator") String btLocator);
+  Response getVcsRootEntryCheckoutRules(@PathParam("id") String id, @PathParam("btLocator") Locator btLocator);
 
-    @PUT
+  @PUT
     @Consumes("text/plain")
     @Produces("text/plain")
     @Path("/{btLocator}/vcs-root-entries/{id}/checkout-rules")
-    Response updateVcsRootEntryCheckoutRules(@PathParam("id") String id, @PathParam("btLocator") String btLocator);
+  Response updateVcsRootEntryCheckoutRules(@PathParam("id") String id, @PathParam("btLocator") Locator btLocator);
 
 }
diff --git a/src/main/java/jetbrains/teamcity/rest/client/resources/impl/BuildTypesResourceImpl.java b/src/main/java/jetbrains/teamcity/rest/client/resources/impl/BuildTypesResourceImpl.java
index 2f5c390..8565c24 100644
--- a/src/main/java/jetbrains/teamcity/rest/client/resources/impl/BuildTypesResourceImpl.java
+++ b/src/main/java/jetbrains/teamcity/rest/client/resources/impl/BuildTypesResourceImpl.java
@@ -5,7 +5,10 @@
 
 import com.google.api.client.http.HttpResponse;
 import jetbrains.teamcity.rest.client.model.BuildType;
+import jetbrains.teamcity.rest.client.model.PropEntityStep;
+import jetbrains.teamcity.rest.client.model.VcsRootEntry;
 import jetbrains.teamcity.rest.client.resources.BuildTypesResource;
+import jetbrains.teamcity.rest.client.resources.Locator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.teamcity.rest.client.RequestsProcessor;
 
@@ -14,15 +17,21 @@
 
 public class BuildTypesResourceImpl extends ResourceImpl implements BuildTypesResource {
 
+  public static final String BUILD_TYPES = "/buildTypes";
+
   public BuildTypesResourceImpl(@NotNull RequestsProcessor processor) {
     super(processor);
   }
 
   public BuildType addBuildType(@NotNull BuildType type, String fields) {
-    final HttpResponse response = processor.post("/buildTypes", processor.asJson(type));
+    final HttpResponse response = processor.post(BUILD_TYPES, processor.asJson(type));
+    return safeParse(response, BuildType.class);
+  }
+
+  public static <T> T safeParse(HttpResponse response, Class<T> clazz) {
     try {
       if ("application/json".equals(response.getContentType())) {
-        return response.parseAs(BuildType.class);
+        return response.parseAs(clazz);
       } else {
         // Not good.
         System.err.println("Error: " + response.parseAsString());
@@ -39,352 +48,353 @@ public Response getBuildTypes(String locator, String fields) {
   }
 
 
-  public Response getAgentRequirements(String btLocator) {
+  public Response getAgentRequirements(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addAgentRequirement(String btLocator) {
+  public Response addAgentRequirement(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceAgentRequirements(String btLocator) {
+  public Response replaceAgentRequirements(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addFeature(String btLocator) {
+  public Response addFeature(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getFeatures(String btLocator) {
+  public Response getFeatures(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceFeatures(String btLocator) {
+  public Response replaceFeatures(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getSnapshotDep(String btLocator, String snapshotDepLocator) {
+  public Response getSnapshotDep(Locator btLocator, String snapshotDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteSnapshotDep(String btLocator, String snapshotDepLocator) {
+  public void deleteSnapshotDep(Locator btLocator, String snapshotDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceSnapshotDep(String btLocator, String snapshotDepLocator) {
+  public Response replaceSnapshotDep(Locator btLocator, String snapshotDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsRootEntry(String id, String btLocator) {
+  public Response getVcsRootEntry(String id, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response updateVcsRootEntry(String id, String btLocator) {
+  public Response updateVcsRootEntry(String id, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteVcsRootEntry(String id, String btLocator) {
+  public void deleteVcsRootEntry(String id, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getArtifactDep(String btLocator, String artifactDepLocator) {
+  public Response getArtifactDep(Locator btLocator, String artifactDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteArtifactDep(String btLocator, String artifactDepLocator) {
+  public void deleteArtifactDep(Locator btLocator, String artifactDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceArtifactDep(String btLocator, String artifactDepLocator) {
+  public Response replaceArtifactDep(Locator btLocator, String artifactDepLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getTrigger(String btLocator, String triggerLocator) {
+  public Response getTrigger(Locator btLocator, String triggerLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteTrigger(String btLocator, String triggerLocator) {
+  public void deleteTrigger(Locator btLocator, String triggerLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceTrigger(String btLocator, String triggerLocator) {
+  public Response replaceTrigger(Locator btLocator, String triggerLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getAgentRequirement(String btLocator, String agentRequirementLocator) {
+  public Response getAgentRequirement(Locator btLocator, String agentRequirementLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteAgentRequirement(String btLocator, String agentRequirementLocator) {
+  public void deleteAgentRequirement(Locator btLocator, String agentRequirementLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceAgentRequirement(String btLocator, String agentRequirementLocator) {
+  public Response replaceAgentRequirement(Locator btLocator, String agentRequirementLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response setParameterValue(String btLocator, String name) {
+  public Response setParameterValue(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getParameterValue(String btLocator, String name) {
+  public Response getParameterValue(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getParameter(String btLocator, String name) {
+  public Response getParameter(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteBuildTypeParameter(String btLocator, String name) {
+  public void deleteBuildTypeParameter(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getTriggers(String btLocator) {
+  public Response getTriggers(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addTrigger(String btLocator) {
+  public Response addTrigger(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceTriggers(String btLocator) {
+  public Response replaceTriggers(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addStep(String btLocator) {
+  public Response addStep(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getSteps(String btLocator) {
+  public Response getSteps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceSteps(String btLocator) {
+  public Response replaceSteps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getInvestigations(String btLocator, String fields) {
+  public Response getInvestigations(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsRootEntries(String btLocator) {
+  public Response getVcsRootEntries(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceVcsRootEntries(String btLocator) {
+  public Response replaceVcsRootEntries(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addVcsRootEntry(String btLocator) {
-    throw new java.lang.UnsupportedOperationException();
+  public VcsRootEntry addVcsRootEntry(@NotNull VcsRootEntry entry, Locator btLocator) {
+    final HttpResponse response = processor.post(BUILD_TYPES + "/vcs-root-entries", processor.asJson(entry));
+    return safeParse(response, VcsRootEntry.class);
   }
 
 
-  public Response getStep(String btLocator, String stepId) {
+  public PropEntityStep getStep(Locator btLocator, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteStep(String btLocator, String stepId) {
+  public void deleteStep(Locator btLocator, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceStep(String btLocator, String stepId) {
+  public Response replaceStep(Locator btLocator, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getStepParameters(String btLocator, String stepId) {
+  public Response getStepParameters(Locator btLocator, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceStepParameters(String btLocator, String stepId) {
+  public Response replaceStepParameters(Locator btLocator, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getStepParameter(String btLocator, String stepId, String parameterName) {
+  public Response getStepParameter(Locator btLocator, String stepId, String parameterName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addStepParameter(String btLocator, String stepId, String parameterName) {
+  public Response addStepParameter(Locator btLocator, String stepId, String parameterName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getStepSetting(String btLocator, String fieldName, String stepId) {
+  public Response getStepSetting(Locator btLocator, String fieldName, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response changeStepSetting(String btLocator, String fieldName, String stepId) {
+  public Response changeStepSetting(Locator btLocator, String fieldName, String stepId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteFeature(String btLocator, String featureId) {
+  public void deleteFeature(Locator btLocator, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceFeature(String btLocator, String featureId) {
+  public Response replaceFeature(Locator btLocator, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getFeature(String btLocator, String featureId) {
+  public Response getFeature(Locator btLocator, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getFeatureParameters(String btLocator, String featureId) {
+  public Response getFeatureParameters(Locator btLocator, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceFeatureParameters(String btLocator, String featureId) {
+  public Response replaceFeatureParameters(Locator btLocator, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getFeatureParameter(String btLocator, String featureId, String parameterName) {
+  public Response getFeatureParameter(Locator btLocator, String featureId, String parameterName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addFeatureParameter(String btLocator, String featureId, String parameterName) {
+  public Response addFeatureParameter(Locator btLocator, String featureId, String parameterName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getFeatureSetting(String btLocator, String name, String featureId) {
+  public Response getFeatureSetting(Locator btLocator, String name, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response changeFeatureSetting(String btLocator, String name, String featureId) {
+  public Response changeFeatureSetting(Locator btLocator, String name, String featureId) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getArtifactDeps(String btLocator) {
+  public Response getArtifactDeps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceArtifactDeps(String btLocator) {
+  public Response replaceArtifactDeps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addArtifactDep(String btLocator) {
+  public Response addArtifactDep(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getSnapshotDeps(String btLocator) {
+  public Response getSnapshotDeps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceSnapshotDeps(String btLocator) {
+  public Response replaceSnapshotDeps(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response addSnapshotDep(String btLocator) {
+  public Response addSnapshotDep(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getTriggerSetting(String btLocator, String triggerLocator, String fieldName) {
+  public Response getTriggerSetting(Locator btLocator, String triggerLocator, String fieldName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response changeTriggerSetting(String btLocator, String triggerLocator, String fieldName) {
+  public Response changeTriggerSetting(Locator btLocator, String triggerLocator, String fieldName) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVCSLabelingOptions(String btLocator) {
+  public Response getVCSLabelingOptions(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response setVCSLabelingOptions(String btLocator) {
+  public Response setVCSLabelingOptions(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsFileContent(String btLocator, String path, Boolean resolveParameters) {
+  public Response getVcsFileContent(Locator btLocator, String path, Boolean resolveParameters) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsFileListing(String btLocator, String path, Boolean resolveParameters) {
+  public Response getVcsFileListing(Locator btLocator, String path, Boolean resolveParameters) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsFile(String btLocator, String path, Boolean resolveParameters) {
+  public Response getVcsFile(Locator btLocator, String path, Boolean resolveParameters) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getExampleNewProjectDescriptionCompatibilityVersion1(String btLocator) {
+  public Response getExampleNewProjectDescriptionCompatibilityVersion1(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getExampleNewProjectDescription(String btLocator) {
+  public Response getExampleNewProjectDescription(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getCurrentVcsInstances(String btLocator) {
+  public Response getCurrentVcsInstances(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuilds(String btLocator, String status, String triggeredByUser, Boolean includePersonal,
+  public Response serveBuilds(Locator btLocator, String status, String triggeredByUser, Boolean includePersonal,
                               Boolean includeCanceled, Boolean onlyPinned, String tag, String agentName,
                               String sinceBuild, String sinceDate, Long start, Integer count,
                               String locator, String fields) {
@@ -392,107 +402,107 @@ public Response serveBuilds(String btLocator, String status, String triggeredByU
   }
 
 
-  public Response serveBuildWithProject(String btLocator, String buildLocator, String fields) {
+  public Response serveBuildWithProject(Locator btLocator, String buildLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildField(String field, String btLocator, String buildLocator) {
+  public Response serveBuildField(String field, Locator btLocator, String buildLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBranches(String btLocator, String locator) {
+  public Response serveBranches(Locator btLocator, String locator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeXML(String btLocator, String fields) {
+  public Response serveBuildTypeXML(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteBuildType(String btLocator) {
+  public void deleteBuildType(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeField(String field, String btLocator) {
+  public Response serveBuildTypeField(String field, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response setBuildTypeField(String field, String btLocator) {
+  public Response setBuildTypeField(String field, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeBuildsTags(String btLocator) {
+  public Response serveBuildTypeBuildsTags(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeParameters(String btLocator, String locator, String fields) {
+  public Response serveBuildTypeParameters(Locator btLocator, String locator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response changeBuildTypeParameters(String btLocator, String fields) {
+  public Response changeBuildTypeParameters(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteAllBuildTypeParameters(String btLocator) {
+  public void deleteAllBuildTypeParameters(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response setParameter(String btLocator, String fields) {
+  public Response setParameter(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeSettings(String btLocator) {
+  public Response serveBuildTypeSettings(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response replaceBuildTypeSettings(String btLocator) {
+  public Response replaceBuildTypeSettings(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeSettings(String btLocator, String name) {
+  public Response serveBuildTypeSettings(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response putBuildTypeSetting(String btLocator, String name) {
+  public Response putBuildTypeSetting(Locator btLocator, String name) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response serveBuildTypeTemplate(String btLocator, String fields) {
+  public Response serveBuildTypeTemplate(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getTemplateAssociation(String btLocator, String fields) {
+  public Response getTemplateAssociation(Locator btLocator, String fields) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public void deleteTemplateAssociation(String btLocator) {
+  public void deleteTemplateAssociation(Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response getVcsRootEntryCheckoutRules(String id, String btLocator) {
+  public Response getVcsRootEntryCheckoutRules(String id, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }
 
 
-  public Response updateVcsRootEntryCheckoutRules(String id, String btLocator) {
+  public Response updateVcsRootEntryCheckoutRules(String id, Locator btLocator) {
     throw new java.lang.UnsupportedOperationException();
   }