diff --git a/internal/drivers/keyvaluedriver/keyvaluedriver.go b/internal/drivers/keyvaluedriver/keyvaluedriver.go
index 15c3595072b3b1b4229cea9d48b58890f1931d59..fa5978809844d0ad9f2b1a1ba043074de1efb48d 100644
--- a/internal/drivers/keyvaluedriver/keyvaluedriver.go
+++ b/internal/drivers/keyvaluedriver/keyvaluedriver.go
@@ -9,18 +9,18 @@ import (
 	"github.com/go-redis/redis/v8"
 )
 
-// KeyValueDriver models the redis driver
-type KeyValueDriver struct {
+// KeyValueStore models the redis driver
+type KeyValueStore struct {
 	client *redis.Client
 }
 
 // NewRedisDriver creates and returns a redis driver
-func NewRedisDriver() *KeyValueDriver {
-	return &KeyValueDriver{}
+func NewRedisDriver() *KeyValueStore {
+	return &KeyValueStore{}
 }
 
 // Start starts the redis driver
-func (d *KeyValueDriver) Start() {
+func (d *KeyValueStore) Start() {
 	// Grab the redis host and port from environment vars
 	redisAddress := os.Getenv("REDIS_ADDRESS")
 	// redisPassword := os.Getenv("REDIS_PASSWORD")
@@ -35,12 +35,12 @@ func (d *KeyValueDriver) Start() {
 }
 
 // Get retrieves the value from the redis store that belongs to the given key
-func (d *KeyValueDriver) Get(key *string) string {
+func (d *KeyValueStore) Get(key *string) string {
 	return d.client.Get(context.Background(), *key).Val()
 }
 
 // Set sets the key value pair in the redis store
-func (d *KeyValueDriver) Set(key *string, value *string) error {
+func (d *KeyValueStore) Set(key *string, value *string) error {
 	status := d.client.Set(context.Background(), *key, *value, 0)
 	return status.Err()
 }
diff --git a/internal/usecases/produce/publishmessage.go b/internal/usecases/produce/publishmessage.go
index 8e9b31e8cef943c1f75df320bce91b1c531a5a98..dffd5a8ea4c267a245b21cdeb7a928a6642f3bca 100644
--- a/internal/usecases/produce/publishmessage.go
+++ b/internal/usecases/produce/publishmessage.go
@@ -1,6 +1,9 @@
 package produce
 
 import (
+	"fmt"
+	"query-service/pkg/logger"
+
 	"github.com/streadway/amqp"
 )
 
@@ -9,9 +12,12 @@ func (s *Service) PublishMessage(data *[]byte, sessionID *string) {
 	// Use the sessionID to query the key value store to get the queue we need to send this message to
 	clientQueueID := s.keyValueStore.Get(sessionID)
 
+	logger.Log(fmt.Sprintf("Found client queue %s for session %s", clientQueueID, *sessionID))
+
 	// If this client has now disconnected
 	if clientQueueID == "" {
 		// TODO: Decide whether to throw away the message or perhaps cache it, for now throw it away
+		logger.Log("No client updater queue ID")
 		return
 	}