diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml
index 265964a..951edd3 100644
--- a/.gitea/workflows/tag_release.yaml
+++ b/.gitea/workflows/tag_release.yaml
@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "Creating version"
 
-          VERSION="0.0.11"
+          VERSION="0.0.12"
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${{ gitea.ref }}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
diff --git a/tx0/config/twilio_config.go b/tx0/config/twilio_config.go
index 9e5723a..d175bb7 100644
--- a/tx0/config/twilio_config.go
+++ b/tx0/config/twilio_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-type TwiloConfig struct {
+type TwilioConfig struct {
 	AccountSID string `json:"auth_sid"`
 	ServiceSID string `json:"service_sid"`
 	URI        string `json:"uri"`
@@ -12,10 +12,11 @@ type TwiloConfig struct {
 	Number     string `json:"phone_number"`
 }
 
-func (config *TwiloConfig) PrintConfig() {
-	fmt.Printf("Account SID: %s\n", config.AccountSID)
-	fmt.Printf("Service SID: %s\n", config.ServiceSID)
+func (config *TwilioConfig) PrintConfig() {
+	fmt.Println("Twilio config")
+	fmt.Println("Account SID:", config.AccountSID)
+	fmt.Println("Service SID:", config.ServiceSID)
 	fmt.Println("URI:", config.URI)
-	fmt.Printf("Auth Token: %s\n", config.AuthToken)
-	fmt.Printf("Number: %s\n", config.Number)
+	fmt.Println("Auth Token:", config.AuthToken)
+	fmt.Println("Number:", config.Number)
 }
diff --git a/tx0/contact/contact.go b/tx0/contact/contact.go
index e3b277d..6baee60 100644
--- a/tx0/contact/contact.go
+++ b/tx0/contact/contact.go
@@ -5,7 +5,10 @@ import (
 )
 
 type Contact struct {
-	Id          uuid.UUID `json:"id,omitempty"`
-	PhoneNumber string    `json:"phone_number,omitempty"`
-	UserId      uuid.UUID `json:"user_id,omitempty"`
+	Id          *uuid.UUID `json:"id,omitempty"`
+	Firstname   *string    `json:"first_name,omitempty"`
+	Lastname    *string    `json:"last_name,omitempty"`
+	Nickname    *string    `json:"nickname,omitempty"`
+	PhoneNumber string     `json:"phone_number"`
+	UserId      *uuid.UUID `json:"user_id,omitempty"`
 }
diff --git a/tx0/message/message_event_response.go b/tx0/message/message_event_response.go
index c1cae36..f47d461 100644
--- a/tx0/message/message_event_response.go
+++ b/tx0/message/message_event_response.go
@@ -13,5 +13,13 @@ type MessageEventResponse struct {
 	ScheduledMessageEventId uuid.UUID   `json:"scheduled_message_event_id,omitempty"`
 	Response                types.JSONB `json:"response"`
 	UserId                  uuid.UUID   `json:"user_id,omitempty"`
+	ContactId               *uuid.UUID  `json:"contact_id,omitempty"`
+	MessageId               *uuid.UUID  `json:"message_id,omitempty"`
+	Status                  string      `json:"status"`
 	Sent                    time.Time   `json:"sent"`
 }
+
+const (
+	Message_Event_Response_Status_Instant   = "INSTANT"
+	Message_Event_Response_Status_Scheduled = "SCHEDULED"
+)
diff --git a/tx0/token/token.go b/tx0/token/token.go
index f2be04e..a62607c 100644
--- a/tx0/token/token.go
+++ b/tx0/token/token.go
@@ -11,8 +11,13 @@ type Claims struct {
 	jwt.RegisteredClaims
 }
 
-type Login struct {
-	AccessToken string `json:"access_token"`
-	TokenType   string `json:"token_type"`
-	ExpiresIn   int64  `json:"expires_in"`
+type LoginResult struct {
+	UserId      uuid.UUID `json:"user_id"`
+	AccessToken string    `json:"access_token"`
+	TokenType   string    `json:"token_type"`
+	ExpiresIn   int64     `json:"expires_in"`
 }
+
+// Alias for LoginResult
+// Will be deprecated at some point
+type Login = LoginResult
diff --git a/tx0/user/service_user.go b/tx0/user/service_user.go
index 8bcbda8..22762d5 100644
--- a/tx0/user/service_user.go
+++ b/tx0/user/service_user.go
@@ -7,8 +7,8 @@ import (
 )
 
 type ServiceUser struct {
-	Id         uuid.UUID  `json:"id"`
-	Username string `json:"username,omitempty"`
-	Passphrase string     `json:"passphrase,omitempty"`
-	Created    *time.Time `json:"date_created,omitempty"`
+	Id         uuid.UUID `json:"id"`
+	Username   string    `json:"username,omitempty"`
+	Passphrase string    `json:"passphrase,omitempty"`
+	Created    time.Time `json:"date_created"`
 }
diff --git a/tx0/user/user.go b/tx0/user/user.go
index 0327720..ab6f8af 100644
--- a/tx0/user/user.go
+++ b/tx0/user/user.go
@@ -1,12 +1,18 @@
 package user
 
 import (
+	"time"
+
 	"github.com/google/uuid"
 )
 
 type User struct {
-	Id          uuid.UUID `json:"id"`
-	PhoneNumber string    `json:"phone_number"`
-	Username    string    `json:"username"`
-	Password    string    `json:"password"`
+	Id          uuid.UUID  `json:"id"`
+	PhoneNumber string     `json:"phone_number"`
+	Username    string     `json:"username"`
+	Password    string     `json:"password"`
+	Firstname   *string    `json:"first_name,omitempty"`
+	Lastname    *string    `json:"last_name,omitempty"`
+	Created     time.Time  `json:"date_created"`
+	LastLogin   *time.Time `json:"last_login,omitempty"`
 }