diff --git a/README.md b/README.md
index 71bb24e..a6298af 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Topograph is a component designed to expose the underlying physical network topo
 
 ### 1. CSP Connector
 
-The CSP Connector is responsible for interfacing with various CSPs to retrieve cluster-related information. Currently, it supports AWS, with plans to add support for OCI, GCP, and Azure. The primary goal of the CSP Connector is to obtain the network topology configuration of a cluster, which may require several subsequent API calls. Once the information is obtained, the CSP Connector translates the network topology from CSP-specific formats to an internal format that can be utilized by the Topology Generator.
+The CSP Connector is responsible for interfacing with various CSPs to retrieve cluster-related information. Currently, it supports AWS, OCI, GCP, CoreWeave, bare metal, with plans to add support for Azure. The primary goal of the CSP Connector is to obtain the network topology configuration of a cluster, which may require several subsequent API calls. Once the information is obtained, the CSP Connector translates the network topology from CSP-specific formats to an internal format that can be utilized by the Topology Generator.
 
 ### 2. API Server
 
@@ -45,6 +45,7 @@ For the SLURM engine, topograph supports the following CSPs:
 - OCI
 - GCP
 - CoreWeave
+- Bare metal
 
 ### Kubernetes Engine
 
@@ -64,19 +65,22 @@ There is a special *provider* and *engine* named `test`, which supports both SLU
 - The Topology Generator returns the network topology configuration to the API Server, which then relays it back to the requester.
 
 ## Topograph Installation and Configuration
+Topograph can operate as a standalone service within SLURM clusters or be deployed in Kubernetes clusters.
+
+### Topograph as a Standalone Service
 Topograph can be installed using the `topograph` Debian or RPM package. This package sets up a service but does not start it automatically, allowing users to update the configuration before launch.
 
-### Configuration
+#### Configuration
 The default configuration file is located at [config/topograph-config.yaml](config/topograph-config.yaml). It includes settings for:
  - HTTP endpoint for the Topology Generator
  - SSL/TLS connection
  - environment variables
 
-By default, SSL/TLS is enabled, and the server certificate and key are generated during package installation.
+By default, SSL/TLS is disabled, but the server certificate and key are generated during package installation.
 
 The configuration file also includes an optional section for environment variables. When specified, these variables are added to the shell environment. Note that the `PATH` variable, if provided, is appended to the existing `PATH`.
 
-### Service Management
+#### Service Management
 To enable and start the service, run the following commands:
 ```bash
 systemctl enable topograph.service
@@ -95,39 +99,90 @@ systemctl disable topograph.service
 systemctl daemon-reload
 ```
 
-### Testing the Service
+#### Testing the Service
 To verify the service is running correctly, you can use the following commands:
+
 ```bash
 curl http://localhost:49021/healthz
 
-curl -X POST "http://localhost:49021/v1/generate?provider=test&engine=test"
+id=$(curl -s -X POST -H "Content-Type: application/json" -d '{"provider":{"name":"test"},"engine":{"name":"test"}}' http://localhost:49021/v1/generate)
+
+curl -s "http://localhost:49021/v1/topology?uid=$id"
 ```
 
-### Using the Cluster Topology Generator
+#### Using the Cluster Topology Generator
 
 The Cluster Topology Generator offers three endpoints for interacting with the service. Below are the details of each endpoint:
 
-#### 1. Health Endpoint
+##### 1. Health Endpoint
 
 - **URL:** `http://<server>:<port>/healthz`
 - **Description:** This endpoint verifies the service status. It returns a "200 OK" HTTP response if the service is operational.
 
-#### 2. Topology Request Endpoint
+##### 2. Topology Request Endpoint
 
-- **URL:** `http://<server>:<port>/v1/generate`
+- **URL:** `http(s)://<server>:<port>/v1/generate`
 - **Description:** This endpoint is used to request a new cluster topology.
-- **URL Query Parameters:**
-  - **provider**: (mandatory) Specifies the Cloud Service Provider (CSP) such as `aws`, `oci`, `gcp`, `azure`, or `test`.
-  - **engine**: (mandatory) Specifies the configuration format, either `slurm` or `k8s`.
-  - **topology_config_path**: (optional for `engine=slurm`, mandatory for `engine=k8s`) Specifies the file path for the topology config when `engine=slurm`, or the key for the topology config in the configmap when `engine=k8s`. If omitted for `slurm`, the content of the topology config is returned with the HTTP response.
-  - **topology_configmap_name**: (mandatory for `engine=k8s`) Specifies the name of the configmap containing the topology config.
-  - **topology_configmap_namespace**: (mandatory for `engine=k8s`) Specifies the namespace of the configmap containing the topology config.
-  - **skip_reload**: (optional for `engine=slurm`) Omit cluster reconfiguration if present.
+- **Payload:** The payload is a JSON object that includes the following fields:
+  - **provider name**: (mandatory) A string specifying the Service Provider, such as `aws`, `oci`, `gcp`, `cw`, `baremetal` or `test`.
+  - **provider credentials**: (optional) A key-value map with provider-specific parameters for authentication.
+  - **engine name**: (mandatory) A string specifying the topology output, either `slurm` or `k8s`.
+  - **engine parameters**: A key-value map with engine-specific parameters.
+    - **slurm parameters**:
+      - **topology_config_path**: (optional) A string specifying the file path for the topology configuration. If omitted, the topology config content is returned in the HTTP response.
+      - **plugin**: (optional) A string specifying topology plugin. Default topology/tree.
+      - **block_sizes**: (optional) A string specifying block size for topology/block plugin
+      - **skip_reload**: (optional) If present, the cluster reconfiguration is skipped.
+    - **k8s parameters**:
+      - **topology_config_path**: (mandatory) A string specifying the key for the topology config in the ConfigMap.
+      - **topology_configmap_name**: (mandatory) A string specifying the name of the ConfigMap containing the topology config.
+      - **topology_configmap_namespace**: (mandatory) A string specifying the namespace of the ConfigMap containing the topology config.
+      - **nodes**: (optional) An array of regions mapping instance IDs to node names.
+
+  Example:
+
+```json
+  {
+  "provider": {
+    "name": "aws",
+    "creds": {
+      "access_key_id": "id",
+      "secret_access_key": "secret"
+    }
+  },
+  "engine": {
+    "name": "slurm",
+    "params": {
+      "plugin": "topology/block",
+      "block_sizes": "30,120"
+    }
+  },
+  "nodes": [
+    {
+      "region": "region1",
+      "instances": {
+        "instance1": "node1",
+        "instance2": "node2",
+        "instance3": "node3"
+      }
+    },
+    {
+      "region": "region2",
+      "instances": {
+        "instance4": "node4",
+        "instance5": "node5",
+        "instance6": "node6"
+      }
+    }
+  ]
+}
+```
+
 - **Response:** This endpoint immediately returns a "202 Accepted" status with a unique request ID if the request is valid. If not, it returns an appropriate error code.
 
-#### 3. Topology Result Endpoint
+##### 3. Topology Result Endpoint
 
-- **URL:** `http://<server>:<port>/v1/topology`
+- **URL:** `http(s)://<server>:<port>/v1/topology`
 - **Description:** This endpoint retrieves the result of a topology request.
 - **URL Query Parameters:**
   - **uid**: Specifies the request ID returned by the topology request endpoint.
@@ -139,20 +194,12 @@ The Cluster Topology Generator offers three endpoints for interacting with the s
 Example usage:
 
 ```bash
-id=$(curl -s -X POST "http://localhost:49021/v1/generate?provider=aws&engine=slurm&topology_config_path=/path/to/topology.conf")
-
-curl -s http://localhost:49021/v1/topology?uid=$id
-```
-
-You can optionally skip the SLURM reconfiguration:
-
-```bash
-id=$(curl -X POST "http://localhost:49021/v1/generate?provider=oci&engine=slurm&topology_config_path=/path/to/topology.conf&skip_reload)
+id=$(curl -s -X POST -H "Content-Type: application/json" -d @payload.json http://localhost:49021/v1/generate)
 
-curl -s http://localhost:49021/v1/topology?uid=$id
+curl -s "http://localhost:49021/v1/topology?uid=$id"
 ```
 
-### Automated Solution for SLURM
+#### Automated Solution for SLURM
 
 The Cluster Topology Generator enables a fully automated solution when combined with SLURM's `strigger` command. You can set up a trigger that runs whenever a node goes down or comes up:
 
@@ -160,16 +207,16 @@ The Cluster Topology Generator enables a fully automated solution when combined
 strigger --set --node --down --up --flags=perm --program=<script>
 ```
 
-In this setup, the `<script>` would contain the curl command to call the asynchronous endpoint:
+In this setup, the `<script>` would contain the curl command to call the endpoint:
 
 ```bash
-curl -X POST "http://localhost:49021/v1/generate?provider=aws&engine=slurm&topology_config_path=/path/to/topology.conf"
+curl -s -X POST -H "Content-Type: application/json" -d @payload.json http://localhost:49021/v1/generate
 ```
 
 We provide the [create-topology-update-script.sh](scripts/create-topology-update-script.sh) script, which performs the steps outlined above: it creates the topology update script and registers it with the strigger.
 
 The script accepts the following parameters:
-- **provider name** (aws, oci, gcp)
+- **provider name** (aws, oci, gcp, cw, baremetal)
 - **path to the generated topology update script**
 - **path to the topology.conf file**
 
@@ -184,32 +231,3 @@ create-topology-update-script.sh -p aws -s /etc/slurm/update-topology-config.sh
 ```
 
 This automation ensures that your cluster topology is updated and SLURM configuration is reloaded whenever there are changes in node status, maintaining an up-to-date cluster configuration.
-
-
-### Optional: Instance ID to Node Name Mapping
-You can provide a mapping between CSP VM instance IDs and SLURM cluster node names as part of the request payload:
-```bash
-cat payload.json
-{
-  "nodes": [
-    {
-      "region": "region1",
-      "instances": {
-        "instance1": "node1",
-        "instance2": "node2",
-        "instance3": "node3"
-      }
-    },
-    {
-      "region": "region2",
-      "instances": {
-        "instance4": "node4",
-        "instance5": "node5",
-        "instance6": "node6"
-      }
-    }
-  ]
-}
-
-curl -X POST -H "Content-Type: application/json" -d @payload.json "http://localhost:49021/v1/generate?provider=aws&engine=slurm"
-```
diff --git a/config/topograph-config.yaml b/config/topograph-config.yaml
index 4a013d1..62f2165 100644
--- a/config/topograph-config.yaml
+++ b/config/topograph-config.yaml
@@ -1,7 +1,7 @@
 # serving topograph endpoint
 http:
   port: 49021
-  ssl: true
+  ssl: false
 
 # waiting period before processing a request
 request_aggregation_delay: 15s
diff --git a/pkg/common/const.go b/pkg/common/const.go
index a5c9cdc..3f42221 100644
--- a/pkg/common/const.go
+++ b/pkg/common/const.go
@@ -29,8 +29,6 @@ const (
 	EngineTest  = "test"
 
 	KeyUID                    = "uid"
-	KeyProvider               = "provider"
-	KeyEngine                 = "engine"
 	KeyTopoConfigPath         = "topology_config_path"
 	KeyTopoConfigmapName      = "topology_configmap_name"
 	KeyTopoConfigmapNamespace = "topology_configmap_namespace"
diff --git a/pkg/common/types.go b/pkg/common/types.go
index e1075b7..a3d4032 100644
--- a/pkg/common/types.go
+++ b/pkg/common/types.go
@@ -59,7 +59,7 @@ func (e *HTTPError) Error() string {
 }
 
 type Provider interface {
-	GetCredentials(*Credentials) (interface{}, error)
+	GetCredentials(map[string]string) (interface{}, error)
 	GetComputeInstances(context.Context, Engine) ([]ComputeInstances, error)
 	GenerateTopologyConfig(context.Context, interface{}, int, []ComputeInstances) (*Vertex, error)
 }
@@ -68,69 +68,58 @@ type Engine interface {
 	GenerateOutput(context.Context, *Vertex, map[string]string) ([]byte, error)
 }
 
-type Payload struct {
-	Nodes []ComputeInstances `json:"nodes"`
-	Creds *Credentials       `json:"creds,omitempty"` // access credentials
+type TopologyRequest struct {
+	Provider provider           `json:"provider"`
+	Engine   engine             `json:"engine"`
+	Nodes    []ComputeInstances `json:"nodes"`
 }
 
-type ComputeInstances struct {
-	Region    string            `json:"region"`
-	Instances map[string]string `json:"instances"` // <instance ID>:<node name> map
+type provider struct {
+	Name  string            `json:"name"`
+	Creds map[string]string `json:"creds"` // access credentials
 }
 
-type Credentials struct {
-	AWS *AWSCredentials `yaml:"aws,omitempty" json:"aws,omitempty"` // AWS credentials
-	OCI *OCICredentials `yaml:"oci,omitempty" json:"oci,omitempty"` // OCI credentials
+type engine struct {
+	Name   string            `json:"name"`
+	Params map[string]string `json:"params"` // access credentials
 }
 
-type AWSCredentials struct {
-	AccessKeyId     string `yaml:"access_key_id" json:"access_key_id"`
-	SecretAccessKey string `yaml:"secret_access_key" json:"secret_access_key"`
-	Token           string `yaml:"token,omitempty" json:"token,omitempty"` // token is optional
+type ComputeInstances struct {
+	Region    string            `json:"region"`
+	Instances map[string]string `json:"instances"` // <instance ID>:<node name> map
 }
 
-type OCICredentials struct {
-	TenancyID   string `yaml:"tenancy_id" json:"tenancy_id"`
-	UserID      string `yaml:"user_id" json:"user_id"`
-	Region      string `yaml:"region" json:"region"`
-	Fingerprint string `yaml:"fingerprint" json:"fingerprint"`
-	PrivateKey  string `yaml:"private_key" json:"private_key"`
-	Passphrase  string `yaml:"passphrase,omitempty" json:"passphrase,omitempty"` // passphrase is optional
+func NewTopologyRequest(prv string, creds map[string]string, eng string, params map[string]string) *TopologyRequest {
+	return &TopologyRequest{
+		Provider: provider{
+			Name:  prv,
+			Creds: creds,
+		},
+		Engine: engine{
+			Name:   eng,
+			Params: params,
+		},
+	}
 }
 
-func (p *Payload) String() string {
+func (p *TopologyRequest) String() string {
 	var sb strings.Builder
-
-	sb.WriteString(fmt.Sprintf("Payload:\n  Nodes: %v\n", p.Nodes))
-	if p.Creds != nil {
-		sb.WriteString("  Credentials:\n")
-		if p.Creds.AWS != nil {
-			var accessKeyId, secretAccessKey, token string
-			if len(p.Creds.AWS.AccessKeyId) != 0 {
-				accessKeyId = "***"
-			}
-			if len(p.Creds.AWS.SecretAccessKey) != 0 {
-				secretAccessKey = "***"
-			}
-			if len(p.Creds.AWS.Token) != 0 {
-				token = "***"
-			}
-			sb.WriteString(fmt.Sprintf("    AWS: AccessKeyID=%s SecretAccessKey=%s SessionToken=%s\n",
-				accessKeyId, secretAccessKey, token))
-		}
-		if p.Creds.OCI != nil {
-			sb.WriteString("    OCI:\n")
-			sb.WriteString(fmt.Sprintf("         UserID=%s\n", p.Creds.OCI.UserID))
-			sb.WriteString(fmt.Sprintf("         TenancyID=%s\n", p.Creds.OCI.TenancyID))
-			sb.WriteString(fmt.Sprintf("         Region=%s\n", p.Creds.OCI.Region))
-		}
+	sb.WriteString("TopologyRequest:\n")
+	sb.WriteString(fmt.Sprintf("  Provider: %s\n", p.Provider.Name))
+	sb.WriteString("  Credentials: ")
+	for key := range p.Provider.Creds {
+		sb.WriteString(fmt.Sprintf("%s=***,", key))
 	}
+	sb.WriteString("\n")
+	sb.WriteString(fmt.Sprintf("  Engine: %s\n", p.Engine.Name))
+	sb.WriteString(fmt.Sprintf("  Parameters: %v\n", p.Engine.Params))
+	sb.WriteString(fmt.Sprintf("  Nodes: %s\n", p.Nodes))
 
 	return sb.String()
 }
 
-func GetPayload(body []byte) (*Payload, error) {
-	var payload Payload
+func GetTopologyRequest(body []byte) (*TopologyRequest, error) {
+	var payload TopologyRequest
 
 	if len(body) == 0 {
 		return &payload, nil
@@ -140,13 +129,5 @@ func GetPayload(body []byte) (*Payload, error) {
 		return nil, fmt.Errorf("failed to parse payload: %v", err)
 	}
 
-	if payload.Creds != nil {
-		if payload.Creds.AWS != nil {
-			if len(payload.Creds.AWS.AccessKeyId) == 0 || len(payload.Creds.AWS.SecretAccessKey) == 0 {
-				return nil, fmt.Errorf("invalid payload: must provide access_key_id and secret_access_key for AWS")
-			}
-		}
-	}
-
 	return &payload, nil
 }
diff --git a/pkg/common/types_test.go b/pkg/common/types_test.go
index fc34545..d858c3f 100644
--- a/pkg/common/types_test.go
+++ b/pkg/common/types_test.go
@@ -26,14 +26,18 @@ func TestPayload(t *testing.T) {
 	testCases := []struct {
 		name    string
 		input   string
-		payload *Payload
+		payload *TopologyRequest
 		print   string
 		err     string
 	}{
 		{
 			name:    "Case 1: no input",
-			payload: &Payload{},
-			print: `Payload:
+			payload: &TopologyRequest{},
+			print: `TopologyRequest:
+  Provider: 
+  Credentials: 
+  Engine: 
+  Parameters: map[]
   Nodes: []
 `,
 		},
@@ -43,36 +47,26 @@ func TestPayload(t *testing.T) {
   "nodes": 5
 }
 `,
-			err: "failed to parse payload: json: cannot unmarshal number into Go struct field Payload.nodes of type []common.ComputeInstances",
+			err: "failed to parse payload: json: cannot unmarshal number into Go struct field TopologyRequest.nodes of type []common.ComputeInstances",
 		},
 		{
-			name: "Case 3: invalid creds",
+			name: "Case 3: valid input",
 			input: `
 {
-  "nodes": [
-    {
-      "region": "region1",
-      "instances": {
-        "instance1": "node1",
-        "instance2": "node2",
-        "instance3": "node3"
-      }
-    }
-  ],
-  "creds": {
-    "aws": {
+  "provider": {
+    "name": "aws",
+	"creds": {
       "access_key_id": "id",
-      "token": "token"
+      "secret_access_key": "secret"
     }
-  }
-}
-`,
-			err: "invalid payload: must provide access_key_id and secret_access_key for AWS",
-		},
-		{
-			name: "Case 4: valid input",
-			input: `
-{
+  },
+  "engine": {
+    "name": "slurm",
+	"params": {
+	  "plugin": "topology/block",
+	  "block_sizes": "30,120"
+	}
+  },
   "nodes": [
     {
       "region": "region1",
@@ -90,16 +84,24 @@ func TestPayload(t *testing.T) {
         "instance6": "node6"
       }
     }
-  ],
-  "creds": {
-    "aws": {
-      "access_key_id": "id",
-      "secret_access_key": "secret"
-    }
-  }
+  ]
 }
 `,
-			payload: &Payload{
+			payload: &TopologyRequest{
+				Provider: provider{
+					Name: "aws",
+					Creds: map[string]string{
+						"access_key_id":     "id",
+						"secret_access_key": "secret",
+					},
+				},
+				Engine: engine{
+					Name: "slurm",
+					Params: map[string]string{
+						"plugin":      "topology/block",
+						"block_sizes": "30,120",
+					},
+				},
 				Nodes: []ComputeInstances{
 					{
 						Region: "region1",
@@ -118,24 +120,20 @@ func TestPayload(t *testing.T) {
 						},
 					},
 				},
-				Creds: &Credentials{
-					AWS: &AWSCredentials{
-						AccessKeyId:     "id",
-						SecretAccessKey: "secret",
-					},
-				},
 			},
-			print: `Payload:
+			print: `TopologyRequest:
+  Provider: aws
+  Credentials: access_key_id=***,secret_access_key=***,
+  Engine: slurm
+  Parameters: map[block_sizes:30,120 plugin:topology/block]
   Nodes: [{region1 map[instance1:node1 instance2:node2 instance3:node3]} {region2 map[instance4:node4 instance5:node5 instance6:node6]}]
-  Credentials:
-    AWS: AccessKeyID=*** SecretAccessKey=*** SessionToken=
 `,
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			payload, err := GetPayload([]byte(tc.input))
+			payload, err := GetTopologyRequest([]byte(tc.input))
 			if len(tc.err) != 0 {
 				require.EqualError(t, err, tc.err)
 			} else {
diff --git a/pkg/config/config.go b/pkg/config/config.go
index a94d8dd..206334e 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -25,7 +25,6 @@ import (
 	"gopkg.in/yaml.v3"
 	"k8s.io/klog/v2"
 
-	"github.com/NVIDIA/topograph/pkg/common"
 	"github.com/NVIDIA/topograph/pkg/utils"
 )
 
@@ -39,7 +38,7 @@ type Config struct {
 	Env                     map[string]string `yaml:"env"`
 
 	// derived
-	Credentials common.Credentials
+	Credentials map[string]string
 }
 
 type Endpoint struct {
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 1cfba53..b5b2322 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -25,7 +25,13 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var configTemplate = `
+const (
+	credentials = `
+access_key_id: id
+secret_access_key: key
+`
+
+	configTemplate = `
 http:
   port: 49021
   ssl: true
@@ -34,10 +40,12 @@ ssl:
   cert: %s
   key: %s
   ca_cert: %s
+credentials_path: %s
 env:
   SLURM_CONF: /etc/slurm/config.yaml
   PATH: /a/b/c
 `
+)
 
 func TestConfig(t *testing.T) {
 	file, err := os.CreateTemp("", "test-cfg-*.yml")
@@ -60,7 +68,16 @@ func TestConfig(t *testing.T) {
 	defer func() { _ = os.Remove(caCert.Name()) }()
 	defer func() { _ = caCert.Close() }()
 
-	_, err = file.WriteString(fmt.Sprintf(configTemplate, cert.Name(), key.Name(), caCert.Name()))
+	creds, err := os.CreateTemp("", "test-creds-*.yml")
+	require.NoError(t, err)
+	defer func() { _ = os.Remove(creds.Name()) }()
+	defer func() { _ = creds.Close() }()
+	credsPath := creds.Name()
+
+	_, err = creds.WriteString(credentials)
+	require.NoError(t, err)
+
+	_, err = file.WriteString(fmt.Sprintf(configTemplate, cert.Name(), key.Name(), caCert.Name(), creds.Name()))
 	require.NoError(t, err)
 
 	cfg, err := NewFromFile(file.Name())
@@ -77,6 +94,8 @@ func TestConfig(t *testing.T) {
 			Key:    key.Name(),
 			CaCert: caCert.Name(),
 		},
+		CredsPath:   &credsPath,
+		Credentials: map[string]string{"access_key_id": "id", "secret_access_key": "key"},
 		Env: map[string]string{
 			"SLURM_CONF": "/etc/slurm/config.yaml",
 			"PATH":       "/a/b/c",
diff --git a/pkg/factory/engine.go b/pkg/factory/engine.go
index f56f7d4..26da6fb 100644
--- a/pkg/factory/engine.go
+++ b/pkg/factory/engine.go
@@ -53,6 +53,9 @@ func GetEngine(engine string) (common.Engine, *common.HTTPError) {
 type testEngine struct{}
 
 func (eng *testEngine) GenerateOutput(ctx context.Context, tree *common.Vertex, params map[string]string) ([]byte, error) {
+	if params == nil {
+		params = make(map[string]string)
+	}
 	params[common.KeySkipReload] = ""
 	return slurm.GenerateOutput(ctx, tree, params)
 }
diff --git a/pkg/factory/provider.go b/pkg/factory/provider.go
index f38b7ea..b86b8f0 100644
--- a/pkg/factory/provider.go
+++ b/pkg/factory/provider.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/NVIDIA/topograph/pkg/common"
 	"github.com/NVIDIA/topograph/pkg/providers/aws"
+	"github.com/NVIDIA/topograph/pkg/providers/baremetal"
 	"github.com/NVIDIA/topograph/pkg/providers/cw"
 	"github.com/NVIDIA/topograph/pkg/providers/gcp"
 	"github.com/NVIDIA/topograph/pkg/providers/oci"
@@ -44,6 +45,8 @@ func GetProvider(provider string) (common.Provider, *common.HTTPError) {
 		prv, err = oci.GetProvider()
 	case common.ProviderCW:
 		prv, err = cw.GetProvider()
+	case common.ProviderBM:
+		prv, err = baremetal.GetProvider()
 	case common.ProviderTest:
 		prv = GetTestProvider()
 	default:
@@ -69,7 +72,7 @@ func GetTestProvider() *testProvider {
 	return p
 }
 
-func (p *testProvider) GetCredentials(_ *common.Credentials) (interface{}, error) {
+func (p *testProvider) GetCredentials(_ map[string]string) (interface{}, error) {
 	return nil, nil
 }
 
diff --git a/pkg/node_observer/controller.go b/pkg/node_observer/controller.go
index a1dd5a8..2b25a87 100644
--- a/pkg/node_observer/controller.go
+++ b/pkg/node_observer/controller.go
@@ -17,7 +17,9 @@
 package node_observer
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 
@@ -25,6 +27,7 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/NVIDIA/topograph/pkg/common"
+	"github.com/NVIDIA/topograph/pkg/utils"
 )
 
 type Controller struct {
@@ -35,24 +38,29 @@ type Controller struct {
 }
 
 func NewController(ctx context.Context, client kubernetes.Interface, cfg *Config) (*Controller, error) {
-	req, err := http.NewRequest("POST", cfg.TopologyGeneratorURL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create HTTP request: %v", err)
+	var f utils.HttpRequestFunc = func() (*http.Request, error) {
+		params := map[string]string{
+			common.KeyTopoConfigPath:         cfg.TopologyConfigmap.Filename,
+			common.KeyTopoConfigmapName:      cfg.TopologyConfigmap.Name,
+			common.KeyTopoConfigmapNamespace: cfg.TopologyConfigmap.Namespace,
+		}
+		payload := common.NewTopologyRequest(cfg.Provider, nil, cfg.Engine, params)
+		data, err := json.Marshal(payload)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse payload: %v", err)
+		}
+		req, err := http.NewRequest("POST", cfg.TopologyGeneratorURL, bytes.NewBuffer(data))
+		if err != nil {
+			return nil, fmt.Errorf("failed to create HTTP request: %v", err)
+		}
+		req.Header.Set("Content-Type", "application/json")
+		return req, nil
 	}
-
-	q := req.URL.Query()
-	q.Add(common.KeyProvider, cfg.Provider)
-	q.Add(common.KeyEngine, cfg.Engine)
-	q.Add(common.KeyTopoConfigPath, cfg.TopologyConfigmap.Filename)
-	q.Add(common.KeyTopoConfigmapName, cfg.TopologyConfigmap.Name)
-	q.Add(common.KeyTopoConfigmapNamespace, cfg.TopologyConfigmap.Namespace)
-	req.URL.RawQuery = q.Encode()
-
 	return &Controller{
 		ctx:          ctx,
 		client:       client,
 		cfg:          cfg,
-		nodeInformer: NewNodeInformer(ctx, client, cfg.NodeLabels, req),
+		nodeInformer: NewNodeInformer(ctx, client, cfg.NodeLabels, f),
 	}, nil
 }
 
diff --git a/pkg/node_observer/node_informer.go b/pkg/node_observer/node_informer.go
index 00b7107..0e84f2c 100644
--- a/pkg/node_observer/node_informer.go
+++ b/pkg/node_observer/node_informer.go
@@ -18,7 +18,6 @@ package node_observer
 
 import (
 	"context"
-	"net/http"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,11 +33,11 @@ import (
 type NodeInformer struct {
 	ctx     context.Context
 	client  kubernetes.Interface
-	req     *http.Request
+	reqFunc utils.HttpRequestFunc
 	factory informers.SharedInformerFactory
 }
 
-func NewNodeInformer(ctx context.Context, client kubernetes.Interface, nodeLabels map[string]string, req *http.Request) *NodeInformer {
+func NewNodeInformer(ctx context.Context, client kubernetes.Interface, nodeLabels map[string]string, reqFunc utils.HttpRequestFunc) *NodeInformer {
 	klog.Infof("Configuring node informer with labels %v", nodeLabels)
 	listOptionsFunc := func(options *metav1.ListOptions) {
 		options.LabelSelector = labels.Set(nodeLabels).AsSelector().String()
@@ -46,7 +45,7 @@ func NewNodeInformer(ctx context.Context, client kubernetes.Interface, nodeLabel
 	return &NodeInformer{
 		ctx:     ctx,
 		client:  client,
-		req:     req,
+		reqFunc: reqFunc,
 		factory: informers.NewSharedInformerFactoryWithOptions(client, 0, informers.WithTweakListOptions(listOptionsFunc)),
 	}
 }
@@ -87,7 +86,7 @@ func (n *NodeInformer) Stop(_ error) {
 }
 
 func (n *NodeInformer) SendRequest() {
-	_, _, err := utils.HttpRequestWithRetries(n.req)
+	_, _, err := utils.HttpRequestWithRetries(n.reqFunc)
 	if err != nil {
 		klog.Errorf("failed to send HTTP request: %v", err)
 	}
diff --git a/pkg/providers/aws/imds.go b/pkg/providers/aws/imds.go
index 948771b..d076a34 100644
--- a/pkg/providers/aws/imds.go
+++ b/pkg/providers/aws/imds.go
@@ -47,14 +47,16 @@ type Creds struct {
 }
 
 func getToken() (string, error) {
-	req, err := http.NewRequest("PUT", IMDS_TOKEN_URL, nil)
-	if err != nil {
-		return "", fmt.Errorf("failed to create HTTP request: %v", err)
-	}
-
-	req.Header.Add("X-aws-ec2-metadata-token-ttl-seconds", "21600")
+	var f utils.HttpRequestFunc = (func() (*http.Request, error) {
+		req, err := http.NewRequest("PUT", IMDS_TOKEN_URL, nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create HTTP request: %v", err)
+		}
+		req.Header.Add("X-aws-ec2-metadata-token-ttl-seconds", "21600")
+		return req, nil
+	})
 
-	_, data, err := utils.HttpRequest(req)
+	_, data, err := utils.HttpRequest(f)
 	if err != nil {
 		return "", fmt.Errorf("failed to send HTTP request: %v", err)
 	}
@@ -79,17 +81,19 @@ func getMetadata(path string) ([]byte, error) {
 	url := fmt.Sprintf("%s/%s", IMDS_URL, path)
 	klog.V(4).Infof("Requesting URL %s", url)
 
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create HTTP request: %v", err)
-	}
-
-	err = addToken(req)
-	if err != nil {
-		return nil, err
+	var f utils.HttpRequestFunc = func() (*http.Request, error) {
+		req, err := http.NewRequest("GET", url, nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create HTTP request: %v", err)
+		}
+		err = addToken(req)
+		if err != nil {
+			return nil, err
+		}
+		return req, nil
 	}
 
-	resp, data, err := utils.HttpRequest(req)
+	resp, data, err := utils.HttpRequest(f)
 	if err != nil {
 		return nil, fmt.Errorf("failed to send HTTP request: %v", err)
 	}
diff --git a/pkg/providers/aws/instance_topology.go b/pkg/providers/aws/instance_topology.go
index d37c28d..d911da6 100644
--- a/pkg/providers/aws/instance_topology.go
+++ b/pkg/providers/aws/instance_topology.go
@@ -32,7 +32,7 @@ import (
 
 var defaultPageSize int32 = 100
 
-func GenerateInstanceTopology(ctx context.Context, creds *common.AWSCredentials, pageSize int32, cis []common.ComputeInstances) ([]types.InstanceTopology, error) {
+func GenerateInstanceTopology(ctx context.Context, creds *Credentials, pageSize int32, cis []common.ComputeInstances) ([]types.InstanceTopology, error) {
 	var err error
 	topology := []types.InstanceTopology{}
 	for _, ci := range cis {
@@ -44,7 +44,7 @@ func GenerateInstanceTopology(ctx context.Context, creds *common.AWSCredentials,
 	return topology, nil
 }
 
-func generateInstanceTopology(ctx context.Context, creds *common.AWSCredentials, pageSize int32, ci *common.ComputeInstances, topology []types.InstanceTopology) ([]types.InstanceTopology, error) {
+func generateInstanceTopology(ctx context.Context, creds *Credentials, pageSize int32, ci *common.ComputeInstances, topology []types.InstanceTopology) ([]types.InstanceTopology, error) {
 	if len(ci.Region) == 0 {
 		return nil, fmt.Errorf("must specify region to query instance topology")
 	}
diff --git a/pkg/providers/aws/provider.go b/pkg/providers/aws/provider.go
index e96a34a..488eb3b 100644
--- a/pkg/providers/aws/provider.go
+++ b/pkg/providers/aws/provider.go
@@ -32,17 +32,29 @@ import (
 
 type Provider struct{}
 
+type Credentials struct {
+	AccessKeyId     string
+	SecretAccessKey string
+	Token           string // token is optional
+}
+
 func GetProvider() (*Provider, error) {
 	return &Provider{}, nil
 }
 
-func (p *Provider) GetCredentials(creds *common.Credentials) (interface{}, error) {
-	if creds != nil && creds.AWS != nil {
-		return creds.AWS, nil
-	}
-
+func (p *Provider) GetCredentials(creds map[string]string) (interface{}, error) {
 	var accessKeyID, secretAccessKey, sessionToken string
-	if len(os.Getenv("AWS_ACCESS_KEY_ID")) != 0 && len(os.Getenv("AWS_SECRET_ACCESS_KEY")) != 0 {
+
+	if len(creds) != 0 {
+		klog.Infof("Using provided AWS credentials")
+		if accessKeyID = creds["access_key_id"]; len(accessKeyID) == 0 {
+			return nil, fmt.Errorf("credentials error: missing access_key_id")
+		}
+		if secretAccessKey = creds["secret_access_key"]; len(secretAccessKey) == 0 {
+			return nil, fmt.Errorf("credentials error: missing secret_access_key")
+		}
+		sessionToken = creds["token"]
+	} else if len(os.Getenv("AWS_ACCESS_KEY_ID")) != 0 && len(os.Getenv("AWS_SECRET_ACCESS_KEY")) != 0 {
 		klog.Infof("Using shell AWS credentials")
 		accessKeyID = os.Getenv("AWS_ACCESS_KEY_ID")
 		secretAccessKey = os.Getenv("AWS_SECRET_ACCESS_KEY")
@@ -57,7 +69,8 @@ func (p *Provider) GetCredentials(creds *common.Credentials) (interface{}, error
 		secretAccessKey = nodeCreds.SecretAccessKey
 		sessionToken = nodeCreds.Token
 	}
-	return &common.AWSCredentials{
+
+	return &Credentials{
 		AccessKeyId:     accessKeyID,
 		SecretAccessKey: secretAccessKey,
 		Token:           sessionToken,
@@ -96,7 +109,7 @@ func (p *Provider) GetComputeInstances(ctx context.Context, engine common.Engine
 }
 
 func (p *Provider) GenerateTopologyConfig(ctx context.Context, cr interface{}, pageSize int, instances []common.ComputeInstances) (*common.Vertex, error) {
-	creds := cr.(*common.AWSCredentials)
+	creds := cr.(*Credentials)
 	topology, err := GenerateInstanceTopology(ctx, creds, int32(pageSize), instances)
 	if err != nil {
 		return nil, err
diff --git a/pkg/providers/baremetal/provider.go b/pkg/providers/baremetal/provider.go
index 9d248cd..29f1a0b 100644
--- a/pkg/providers/baremetal/provider.go
+++ b/pkg/providers/baremetal/provider.go
@@ -16,7 +16,7 @@ func GetProvider() (*Provider, error) {
 	return &Provider{}, nil
 }
 
-func (p *Provider) GetCredentials(_ *common.Credentials) (interface{}, error) {
+func (p *Provider) GetCredentials(_ map[string]string) (interface{}, error) {
 	return nil, nil
 }
 
diff --git a/pkg/providers/cw/provider.go b/pkg/providers/cw/provider.go
index 3963657..dafa8ba 100644
--- a/pkg/providers/cw/provider.go
+++ b/pkg/providers/cw/provider.go
@@ -36,7 +36,7 @@ func GetProvider() (*Provider, error) {
 	return &Provider{}, nil
 }
 
-func (p *Provider) GetCredentials(_ *common.Credentials) (interface{}, error) {
+func (p *Provider) GetCredentials(_ map[string]string) (interface{}, error) {
 	return nil, nil
 }
 
diff --git a/pkg/providers/gcp/provider.go b/pkg/providers/gcp/provider.go
index 271d11a..f56d845 100644
--- a/pkg/providers/gcp/provider.go
+++ b/pkg/providers/gcp/provider.go
@@ -34,7 +34,7 @@ func GetProvider() (*Provider, error) {
 	return &Provider{}, nil
 }
 
-func (p *Provider) GetCredentials(_ *common.Credentials) (interface{}, error) {
+func (p *Provider) GetCredentials(_ map[string]string) (interface{}, error) {
 	return nil, nil
 }
 
diff --git a/pkg/providers/oci/provider.go b/pkg/providers/oci/provider.go
index cc4bd8c..80d82bf 100644
--- a/pkg/providers/oci/provider.go
+++ b/pkg/providers/oci/provider.go
@@ -36,14 +36,28 @@ func GetProvider() (*Provider, error) {
 	return &Provider{}, nil
 }
 
-func (p *Provider) GetCredentials(creds *common.Credentials) (interface{}, error) {
-	if creds != nil && creds.OCI != nil {
+func (p *Provider) GetCredentials(creds map[string]string) (interface{}, error) {
+	if len(creds) != 0 {
+		var tenancyID, userID, region, fingerprint, privateKey, passphrase string
 		klog.Info("Using provided credentials")
-		var passphrase *string
-		if creds.OCI.Passphrase != "" {
-			passphrase = &creds.OCI.Passphrase
+		if tenancyID = creds["tenancy_id"]; len(tenancyID) == 0 {
+			return nil, fmt.Errorf("credentials error: missing tenancy_id")
 		}
-		return OCICommon.NewRawConfigurationProvider(creds.OCI.TenancyID, creds.OCI.UserID, creds.OCI.Region, creds.OCI.Fingerprint, creds.OCI.PrivateKey, passphrase), nil
+		if userID = creds["user_id"]; len(userID) == 0 {
+			return nil, fmt.Errorf("credentials error: missing user_id")
+		}
+		if region = creds["region"]; len(region) == 0 {
+			return nil, fmt.Errorf("credentials error: missing region")
+		}
+		if fingerprint = creds["fingerprint"]; len(fingerprint) == 0 {
+			return nil, fmt.Errorf("credentials error: missing fingerprint")
+		}
+		if privateKey = creds["private_key"]; len(privateKey) == 0 {
+			return nil, fmt.Errorf("credentials error: missing private_key")
+		}
+		passphrase = creds["passphrase"]
+
+		return OCICommon.NewRawConfigurationProvider(tenancyID, userID, region, fingerprint, privateKey, &passphrase), nil
 	}
 
 	klog.Info("No credentials provided, trying default configuration provider")
diff --git a/pkg/server/engine.go b/pkg/server/engine.go
index df2652e..06f2983 100644
--- a/pkg/server/engine.go
+++ b/pkg/server/engine.go
@@ -34,7 +34,7 @@ type asyncController struct {
 }
 
 func processRequest(item interface{}) (interface{}, *common.HTTPError) {
-	tr := item.(*TopologyRequest)
+	tr := item.(*common.TopologyRequest)
 	var code int
 	start := time.Now()
 
@@ -44,21 +44,21 @@ func processRequest(item interface{}) (interface{}, *common.HTTPError) {
 	} else {
 		code = http.StatusOK
 	}
-	metrics.Add(tr.provider, tr.engine, code, time.Since(start))
+	metrics.Add(tr.Provider.Name, tr.Engine.Name, code, time.Since(start))
 
 	return ret, err
 }
 
-func processTopologyRequest(tr *TopologyRequest) ([]byte, *common.HTTPError) {
-	klog.InfoS("Creating topology config", "provider", tr.provider, "engine", tr.engine)
+func processTopologyRequest(tr *common.TopologyRequest) ([]byte, *common.HTTPError) {
+	klog.InfoS("Creating topology config", "provider", tr.Provider.Name, "engine", tr.Engine.Name)
 
-	eng, httpErr := factory.GetEngine(tr.engine)
+	eng, httpErr := factory.GetEngine(tr.Engine.Name)
 	if httpErr != nil {
 		klog.Error(httpErr.Error())
 		return nil, httpErr
 	}
 
-	prv, httpErr := factory.GetProvider(tr.provider)
+	prv, httpErr := factory.GetProvider(tr.Provider.Name)
 	if httpErr != nil {
 		klog.Error(httpErr.Error())
 		return nil, httpErr
@@ -67,7 +67,7 @@ func processTopologyRequest(tr *TopologyRequest) ([]byte, *common.HTTPError) {
 	ctx := context.TODO()
 
 	// if the instance/node mapping is not provided in the payload, get the mapping from the provider
-	computeInstances := tr.payload.Nodes
+	computeInstances := tr.Nodes
 	if len(computeInstances) == 0 {
 		var err error
 		computeInstances, err = prv.GetComputeInstances(ctx, eng)
@@ -76,7 +76,7 @@ func processTopologyRequest(tr *TopologyRequest) ([]byte, *common.HTTPError) {
 		}
 	}
 
-	creds, err := prv.GetCredentials(checkCredentials(tr.payload.Creds, &srv.cfg.Credentials))
+	creds, err := prv.GetCredentials(checkCredentials(tr.Provider.Creds, srv.cfg.Credentials))
 	if err != nil {
 		klog.Error(err.Error())
 		return nil, common.NewHTTPError(http.StatusUnauthorized, err.Error())
@@ -94,7 +94,7 @@ func processTopologyRequest(tr *TopologyRequest) ([]byte, *common.HTTPError) {
 		return nil, common.NewHTTPError(http.StatusInternalServerError, err.Error())
 	}
 
-	data, err := eng.GenerateOutput(ctx, root, tr.params)
+	data, err := eng.GenerateOutput(ctx, root, tr.Engine.Params)
 	if err != nil {
 		klog.Error(err.Error())
 		return nil, common.NewHTTPError(http.StatusInternalServerError, err.Error())
@@ -103,8 +103,8 @@ func processTopologyRequest(tr *TopologyRequest) ([]byte, *common.HTTPError) {
 	return data, nil
 }
 
-func checkCredentials(payloadCreds, cfgCreds *common.Credentials) *common.Credentials {
-	if payloadCreds != nil {
+func checkCredentials(payloadCreds, cfgCreds map[string]string) map[string]string {
+	if len(payloadCreds) != 0 {
 		return payloadCreds
 	}
 	return cfgCreds
diff --git a/pkg/server/grpc_client.go b/pkg/server/grpc_client.go
index 6fea126..409a9d7 100644
--- a/pkg/server/grpc_client.go
+++ b/pkg/server/grpc_client.go
@@ -28,7 +28,7 @@ import (
 	pb "github.com/NVIDIA/topograph/pkg/protos"
 )
 
-func forwardRequest(ctx context.Context, tr *TopologyRequest, url string, cis []common.ComputeInstances) (*common.Vertex, error) {
+func forwardRequest(ctx context.Context, tr *common.TopologyRequest, url string, cis []common.ComputeInstances) (*common.Vertex, error) {
 	klog.Infof("Forwarding request to %s", url)
 	conn, err := grpc.NewClient(url, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
@@ -48,7 +48,7 @@ func forwardRequest(ctx context.Context, tr *TopologyRequest, url string, cis []
 	klog.Infof("Getting topology for instances %v", ids)
 
 	response, err := client.DescribeTopology(ctx, &pb.TopologyRequest{
-		Provider:    tr.provider,
+		Provider:    tr.Provider.Name,
 		Region:      "",
 		InstanceIds: ids,
 	})
diff --git a/pkg/server/http_server.go b/pkg/server/http_server.go
index 7d7a975..37df272 100644
--- a/pkg/server/http_server.go
+++ b/pkg/server/http_server.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"k8s.io/klog/v2"
@@ -38,13 +37,6 @@ type HttpServer struct {
 	async *asyncController
 }
 
-type TopologyRequest struct {
-	provider string
-	engine   string
-	params   map[string]string
-	payload  *common.Payload
-}
-
 var srv *HttpServer
 
 func InitHttpServer(ctx context.Context, cfg *config.Config) {
@@ -106,7 +98,7 @@ func generate(w http.ResponseWriter, r *http.Request) {
 	_, _ = w.Write([]byte(uid))
 }
 
-func readRequest(w http.ResponseWriter, r *http.Request) *TopologyRequest {
+func readRequest(w http.ResponseWriter, r *http.Request) *common.TopologyRequest {
 	if r.Method != http.MethodPost {
 		http.Error(w, "Invalid request method", http.StatusMethodNotAllowed)
 		return nil
@@ -119,21 +111,13 @@ func readRequest(w http.ResponseWriter, r *http.Request) *TopologyRequest {
 	}
 	defer func() { _ = r.Body.Close() }()
 
-	tr := &TopologyRequest{}
-
-	tr.payload, err = common.GetPayload(body)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return nil
-	}
-
-	tr.provider, tr.engine, tr.params, err = parseQuery(r.URL.Query())
+	tr, err := common.GetTopologyRequest(body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return nil
 	}
 
-	klog.InfoS("Topology request", "provider", tr.provider, "engine", tr.engine, "params", tr.params, "payload", tr.payload.String())
+	klog.Info(tr.String())
 
 	if err = validate(tr); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
@@ -143,44 +127,23 @@ func readRequest(w http.ResponseWriter, r *http.Request) *TopologyRequest {
 	return tr
 }
 
-func parseQuery(vals url.Values) (string, string, map[string]string, error) {
-	params := make(map[string]string)
-	var provider, engine string
-
-	for key, arr := range vals {
-		switch key {
-		case common.KeyProvider:
-			provider = arr[0]
-		case common.KeyEngine:
-			engine = arr[0]
-		default:
-			params[key] = arr[0]
-		}
-	}
-
-	if len(provider) == 0 {
-		return "", "", nil, fmt.Errorf("missing provider URL query parameter")
-	}
-	if len(engine) == 0 {
-		return "", "", nil, fmt.Errorf("missing engine URL query parameter")
-	}
-
-	return provider, engine, params, nil
-}
-
-func validate(tr *TopologyRequest) error {
-	switch tr.provider {
-	case common.ProviderAWS, common.ProviderOCI, common.ProviderGCP, common.ProviderCW, common.ProviderTest, common.ProviderBM:
+func validate(tr *common.TopologyRequest) error {
+	switch tr.Provider.Name {
+	case common.ProviderAWS, common.ProviderOCI, common.ProviderGCP, common.ProviderCW, common.ProviderBM, common.ProviderTest:
 		//nop
+	case "":
+		return fmt.Errorf("missing provider name")
 	default:
-		return fmt.Errorf("unsupported provider %s", tr.provider)
+		return fmt.Errorf("unsupported provider %s", tr.Provider.Name)
 	}
 
-	switch tr.engine {
+	switch tr.Engine.Name {
+	case "":
+		return fmt.Errorf("missing engine name")
 	case common.EngineK8S:
 		for _, key := range []string{common.KeyTopoConfigPath, common.KeyTopoConfigmapName, common.KeyTopoConfigmapNamespace} {
-			if _, ok := tr.params[key]; !ok {
-				return fmt.Errorf("missing %q URL query parameter", key)
+			if _, ok := tr.Engine.Params[key]; !ok {
+				return fmt.Errorf("missing %q parameter", key)
 			}
 		}
 	}
diff --git a/pkg/utils/http.go b/pkg/utils/http.go
index 54bd072..185fa16 100644
--- a/pkg/utils/http.go
+++ b/pkg/utils/http.go
@@ -40,8 +40,14 @@ var (
 	}
 )
 
+type HttpRequestFunc func() (*http.Request, error)
+
 // HttpRequest sends HTTP requests and returns HTTP response
-func HttpRequest(req *http.Request) (*http.Response, []byte, error) {
+func HttpRequest(f HttpRequestFunc) (*http.Response, []byte, error) {
+	req, err := f()
+	if err != nil {
+		return nil, nil, err
+	}
 	klog.V(4).Infof("Sending HTTP request %s", req.URL.String())
 	client := &http.Client{}
 	resp, err := client.Do(req)
@@ -63,10 +69,10 @@ func HttpRequest(req *http.Request) (*http.Response, []byte, error) {
 }
 
 // HttpRequestWithRetries sends HTTP requests and returns HTTP response; retries if needed
-func HttpRequestWithRetries(req *http.Request) (resp *http.Response, body []byte, err error) {
-	klog.V(4).Infof("Sending HTTP request %s with retries", req.URL.String())
+func HttpRequestWithRetries(f HttpRequestFunc) (resp *http.Response, body []byte, err error) {
+	klog.V(4).Infof("Sending HTTP request with retries")
 	for r := 1; r <= retries; r++ {
-		resp, body, err = HttpRequest(req)
+		resp, body, err = HttpRequest(f)
 		if err == nil || !retryHttpCodes[resp.StatusCode] {
 			break
 		}
diff --git a/scripts/create-topology-update-script.sh b/scripts/create-topology-update-script.sh
index 480ab0f..60bf590 100755
--- a/scripts/create-topology-update-script.sh
+++ b/scripts/create-topology-update-script.sh
@@ -95,8 +95,7 @@ echo ""
 cat <<EOF > $SCRIPT_PATH
 #!/bin/bash
 
-curl -X POST "http://localhost:49021/v1/generate?provider=$PROVIDER&engine=slurm&topology_config_path=$TOPOLOGY_CONFIG_PATH"
-
+curl -X POST -H "Content-Type: application/json" -d '{"provider":{"name":"$PROVIDER"},"engine":{"name":"slurm","params":{"topology_config_path":"$TOPOLOGY_CONFIG_PATH"}}}' http://localhost:49021/v1/generate
 EOF
 
 chmod 755 $SCRIPT_PATH