diff --git a/app/server/src/storage/db.go b/app/server/src/storage/db.go
index c6ddb6fda1..66087ebe1c 100644
--- a/app/server/src/storage/db.go
+++ b/app/server/src/storage/db.go
@@ -3,7 +3,6 @@ package storage
 import (
 	"database/sql"
 	"fmt"
-	"internal-tools-server/models"
 	"log"
 
 	"github.com/jinzhu/gorm"
@@ -15,7 +14,7 @@ var StorageEngine DataStore
 
 // DataStore defines the interface that all db implementations must implement.
 type DataStore interface {
-	ExecuteQuery(query string) ([]models.Component, error)
+	ExecuteQuery(query string) ([]map[string]interface{}, error)
 	GetDatastore() *gorm.DB
 }
 
diff --git a/app/server/src/storage/postgres.go b/app/server/src/storage/postgres.go
index cafa61ecb5..9722666103 100644
--- a/app/server/src/storage/postgres.go
+++ b/app/server/src/storage/postgres.go
@@ -2,7 +2,6 @@ package storage
 
 import (
 	"fmt"
-	"internal-tools-server/models"
 	"log"
 	"os"
 
@@ -88,25 +87,47 @@ func (d *PostgresDataStore) dbConfig() {
 }
 
 // ExecuteQuery executes the query on the DB
-func (d *PostgresDataStore) ExecuteQuery(query string) ([]models.Component, error) {
+func (d *PostgresDataStore) ExecuteQuery(query string) ([]map[string]interface{}, error) {
 	rows, err := d.DB.Raw(query).Rows()
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	components := []models.Component{}
-
-	for rows.Next() {
-		component := models.Component{}
-		err = rows.Scan(
-			&component.ID,
-			&component.Name,
-			&component.Type,
-		)
-		components = append(components, component)
+	cols, err := rows.Columns()
+	if err != nil {
+		return nil, err
 	}
 
-	return components, nil
+	defer rows.Close()
+	values := make([]map[string]interface{}, 0)
+
+	for rows.Next() {
+		// Create a slice of interface{}'s to represent each column,
+		// and a second slice to contain pointers to each item in the columns slice.
+		columns := make([]interface{}, len(cols))
+		columnPointers := make([]interface{}, len(cols))
+		for i := range columns {
+			columnPointers[i] = &columns[i]
+		}
+
+		// Scan the result into the column pointers...
+		if err := rows.Scan(columnPointers...); err != nil {
+			return nil, err
+		}
+
+		// Create our map, and retrieve the value for each column from the pointers slice,
+		// storing it in the map with the name of the column as the key.
+		m := make(map[string]interface{})
+		for i, colName := range cols {
+			val := columnPointers[i].(*interface{})
+			m[colName] = *val
+		}
+
+		// Outputs: map[columnName:value columnName2:value2 columnName3:value3 ...]
+		fmt.Println(m)
+		values = append(values, m)
+	}
+
+	return values, nil
 }
 
 func (d *PostgresDataStore) GetDatastore() *gorm.DB {