diff --git a/pkg/connector/role.go b/pkg/connector/role.go
index 719738d5..74f4d846 100644
--- a/pkg/connector/role.go
+++ b/pkg/connector/role.go
@@ -51,7 +51,8 @@ func roleResource(ctx context.Context, role *splunk.Role, parentResourceID *v2.R
 		displayName,
 		resourceTypeRole,
 		roleID,
-		[]rs.GroupTraitOption{rs.WithGroupProfile(profile)},
+		[]rs.GroupTraitOption{},
+		rs.WithResourceProfile(profile),
 		rs.WithParentResourceID(parentResourceID),
 	)
 	if err != nil {
@@ -122,12 +123,7 @@ func (r *roleResourceType) Grants(ctx context.Context, resource *v2.Resource, pt
 		return nil, "", nil, err
 	}
 
-	roleTrait, err := rs.GetGroupTrait(resource)
-	if err != nil {
-		return nil, "", nil, err
-	}
-
-	roleName, ok := rs.GetProfileStringValue(roleTrait.Profile, "role_name")
+	roleName, ok := rs.GetProfileStringValue(rs.GetProfile(resource), "role_name")
 	if !ok {
 		return nil, "", nil, fmt.Errorf("splunk-connector: error parsing role name from role profile")
 	}
diff --git a/pkg/connector/user.go b/pkg/connector/user.go
index d2491fd9..450e122c 100644
--- a/pkg/connector/user.go
+++ b/pkg/connector/user.go
@@ -39,9 +39,9 @@ func userResource(ctx context.Context, user *splunk.User, parentResourceID *v2.R
 		userID,
 		[]resource.UserTraitOption{
 			resource.WithEmail(user.Content.Email, true),
-			resource.WithUserProfile(profile),
-			resource.WithStatus(v2.UserTrait_Status_STATUS_ENABLED),
 		},
+		resource.WithResourceProfile(profile),
+		resource.WithResourceStatus(v2.Status_RESOURCE_STATUS_ENABLED, ""),
 		resource.WithParentResourceID(parentResourceID),
 	)
 	if err != nil {