diff --git a/models/rbac.go b/models/rbac.go
index ea2210f..78e3611 100644
--- a/models/rbac.go
+++ b/models/rbac.go
@@ -44,7 +44,6 @@ type User struct {
 	LastName      string    `json:"last_name" db:"last_name"`
 	Suffix        string    `json:"suffix" db:"suffix"`
 	EmailAddress  string    `json:"email_address" db:"email_address"`
-	AccountType   string    `json:"account_type" db:"account_type"`
 	EmpID         string    `json:"emp_id" db:"emp_id"`
 	Reg           string    `json:"reg" db:"reg"`
 	Prov          string    `json:"prov" db:"prov"`
@@ -53,7 +52,7 @@ type User struct {
 	Bgy           string    `json:"bgy" db:"bgy"`
 	IsLoggedIn    string    `json:"is_logged_in" db:"is_logged_in"`
 	FirstLoggedIn string    `json:"first_logged_in" db:"first_logged_in"`
-	Address       string    `json:"address" db:"address"`
+	HomeAddress   string    `json:"home_address" db:"home_address"`
 	ContactNumber string    `json:"contact_number" db:"contact_number"`
 	DeviceID      string    `json:"device_id" db:"device_id"`
 	RoleID        int       `json:"role_id" db:"role_id"`
@@ -70,6 +69,7 @@ type AuthorizationContext struct {
 	UserID         string            `json:"user_id"`
 	Resource       string            `json:"resource"`
 	Action         string            `json:"action"`
+	RoleID         string            `json:"role_id"`       // User's role ID
 	UserAttributes map[string]string `json:"user_attributes"`
 	ResourceData   map[string]string `json:"resource_data"` // Additional resource context
 	Environment    map[string]string `json:"environment"`   // Time, location, etc.