diff --git a/openchargemap-api.go b/openchargemap-api.go
index 94db8dc..c45bc5c 100644
--- a/openchargemap-api.go
+++ b/openchargemap-api.go
@@ -238,10 +238,10 @@ type LevelType struct {
 
 // MediaItem A user submitted media item related to a specific charge point or site. Currently always an image.
 type MediaItem struct {
-	ChargePointID      *string `json:"ChargePointID,omitempty"`
+	ChargePointID      *int64 `json:"ChargePointID,omitempty"`
 	Comment            *string `json:"Comment,omitempty"`
 	DateCreated        *string `json:"DateCreated,omitempty"`
-	ID                 *string `json:"ID,omitempty"`
+	ID                 *int64 `json:"ID,omitempty"`
 	IsEnabled          *bool   `json:"IsEnabled,omitempty"`
 	IsExternalResource *bool   `json:"IsExternalResource,omitempty"`
 	IsFeaturedItem     *bool   `json:"IsFeaturedItem,omitempty"`
@@ -435,7 +435,7 @@ type UserComment struct {
 	CommentType   *UserCommentType `json:"CommentType,omitempty"`
 	CommentTypeID *int             `json:"CommentTypeID,omitempty"`
 	DateCreated   *time.Time       `json:"DateCreated,omitempty"`
-	ID            *string          `json:"ID,omitempty"`
+	ID            *int          `json:"ID,omitempty"`
 	RelatedURL    *string          `json:"RelatedURL,omitempty"`
 
 	// User Short public summary profile for a specific Open Charge Map user
diff --git a/openchargemap.openapi.yml b/openchargemap.openapi.yml
index e8e815c..bdfb4a6 100644
--- a/openchargemap.openapi.yml
+++ b/openchargemap.openapi.yml
@@ -673,7 +673,7 @@ components:
           ID: 148527
           UUID: 4C524AA1-3413-4D56-804C-480304FEB0FB
           UserComments:
-            - ID: string
+            - ID: 0
               ChargePointID: 0
               CommentTypeID: 0
               CommentType: {}
@@ -690,8 +690,8 @@ components:
               CheckinStatusType: {}
               '': string
           MediaItems:
-            - ID: string
-              ChargePointID: string
+            - ID: int
+              ChargePointID: int
               ItemURL: string
               ItemThumbnailURL: string
               Comment: string
@@ -1183,7 +1183,7 @@ components:
       description: A user comment or check-in for a specific charging point (POI/Site)
       properties:
         ID:
-          type: string
+          type: integer
         ChargePointID:
           type: integer
         CommentTypeID:
@@ -1212,9 +1212,9 @@ components:
         Currently always an image.
       properties:
         ID:
-          type: string
+          type: integer
         ChargePointID:
-          type: string
+          type: integer
         ItemURL:
           type: string
         ItemThumbnailURL:
@@ -1909,7 +1909,7 @@ components:
               - ID: 148527
                 UUID: 4C524AA1-3413-4D56-804C-480304FEB0FB
                 UserComments:
-                  - ID: string
+                  - ID: 0
                     ChargePointID: 0
                     CommentTypeID: 0
                     CommentType:
@@ -1931,8 +1931,8 @@ components:
                       IsAutomatedCheckin: true
                       IsPositive: true
                 MediaItems:
-                  - ID: string
-                    ChargePointID: string
+                  - ID: 0
+                    ChargePointID: 0
                     ItemURL: string
                     ItemThumbnailURL: string
                     Comment: string