--- a/pkg/imports/config.go	Mon Jan 07 12:13:52 2019 +0100
+++ b/pkg/imports/config.go	Mon Jan 07 13:23:39 2019 +0100
@@ -32,6 +32,10 @@
 	// of the registered import types.
 	ImportKind string
 
+	// ConfigAttributes is a map of optional key/value attributes
+	// of an import configuration.
+	ConfigAttributes map[string]*string
+
 	// Config is JSON serialized form of a import configuration.
 	Config struct {
 		// Kind is the import type.
@@ -50,21 +54,37 @@
 		Cron *CronSpec `json:"cron"`
 		// URL is an optional URL used by the import.
 		URL *string `json:"url"`
+		// Attributes are optional key/value pairs for a configuration.
+		Attributes ConfigAttributes `json:"attributes,omitempty"`
 	}
 
 	// IDConfig is the same as Config with an ID.
 	// Mainly used for server delivered configurations.
 	IDConfig struct {
-		ID         int64      `json:"id"`
-		User       string     `json:"user"`
-		Kind       ImportKind `json:"kind"`
-		SendEMail  bool       `json:"send-email"`
-		AutoAccept bool       `json:"auto-accept"`
-		Cron       *CronSpec  `json:"cron,omitempty"`
-		URL        *string    `json:"url,omitempty"`
+		ID         int64            `json:"id"`
+		User       string           `json:"user"`
+		Kind       ImportKind       `json:"kind"`
+		SendEMail  bool             `json:"send-email"`
+		AutoAccept bool             `json:"auto-accept"`
+		Cron       *CronSpec        `json:"cron,omitempty"`
+		URL        *string          `json:"url,omitempty"`
+		Attributes ConfigAttributes `json:"attributes,omitempty"`
 	}
 )
 
+// Get fetches a value for given key out of the configuration.
+// If the key was not found the bool component of the return value
+// return false.
+func (ca ConfigAttributes) Get(key string) (string, bool) {
+	if ca == nil {
+		return "", false
+	}
+	if value, found := ca[key]; found && value != nil {
+		return *value, true
+	}
+	return "", false
+}
+
 // UnmarshalJSON checks if the incoming string
 // is a registered import type.
 func (ik *ImportKind) UnmarshalJSON(data []byte) error {
@@ -110,6 +130,11 @@
   url
 FROM waterway.import_configuration
 WHERE id = $1`
+
+	loadConfigAttributesSQL = `
+SELECT k, v
+FROM waterway.import_configuration_attributes
+WHERE import_configuration_id = $1`
 )
 
 func loadIDConfig(id int64) (*IDConfig, error) {
@@ -138,6 +163,29 @@
 		if url.Valid {
 			cfg.URL = &url.String
 		}
+		// load the extra attributes.
+		rows, err := conn.QueryContext(ctx, loadConfigAttributesSQL, id)
+		if err != nil {
+			return err
+		}
+		defer rows.Close()
+		var attributes map[string]*string
+		for rows.Next() {
+			var k, v string
+			if err = rows.Scan(&k, &v); err != nil {
+				return err
+			}
+			if attributes == nil {
+				attributes = map[string]*string{}
+			}
+			attributes[k] = &v
+		}
+		if err = rows.Err(); err != nil {
+			return err
+		}
+		if len(attributes) > 0 {
+			cfg.Attributes = attributes
+		}
 		return nil
 	})