diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6a8613a..af24b0b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,19 @@ Check_Point.Mgmt Release Notes
 
 .. contents:: Topics
 
+v6.1.1
+======
+
+Release Summary
+---------------
+
+This is release 6.1.1 of ``check_point.mgmt``, released on 2023-08-12.
+
+Bugfixes
+--------
+
+- module_utils/checkpoint - Remove usage of CertificateError causing failures in ansible-core 2.17.
+
 v6.1.0
 ======
 
@@ -37,9 +50,26 @@ New Modules
 
 - check_point.mgmt.cp_mgmt_add_custom_trusted_ca_certificate - Create new custom trusted CA certificate.
 - check_point.mgmt.cp_mgmt_add_outbound_inspection_certificate - Add outbound-inspection-certificate
-- check_point.mgmt.cp_mgmt_cp_trusted_ca_certificate_facts - Retrieve existing Check Point trusted CA certificate objects facts on Checkpoint devices..
+- check_point.mgmt.cp_mgmt_cp_trusted_ca_certificate_facts - Retrieve existing Check Point trusted CA certificate objects facts on Checkpoint devices.
 - check_point.mgmt.cp_mgmt_custom_trusted_ca_certificate_facts - Retrieve existing custom trusted CA certificate objects facts on Checkpoint devices.
+- check_point.mgmt.cp_mgmt_data_type_compound_group - Manages data-type-compound-group objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_compound_group_facts - Get data-type-compound-group objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_file_attributes - Manages data-type-file-attributes objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_file_attributes_facts - Get data-type-file-attributes objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_file_group_facts - Get data-type-file-group objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_group - Manages data-type-group objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_group_facts - Get data-type-group objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_keywords - Manages data-type-keywords objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_keywords_facts - Get data-type-keywords objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_patterns - Manages data-type-patterns objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_patterns_facts - Get data-type-patterns objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_traditional_group - Manages data-type-traditional-group objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_traditional_group_facts - Get data-type-traditional-group objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_weighted_keywords - Manages data-type-weighted-keywords objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_data_type_weighted_keywords_facts - Get data-type-weighted-keywords objects facts on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_delete_custom_trusted_ca_certificate - Delete existing custom trusted CA certificate using name or uid.
+- check_point.mgmt.cp_mgmt_delete_infinity_idp - Delete Infinity Identity Provider from the Infinity Portal using object name or uid.
+- check_point.mgmt.cp_mgmt_delete_infinity_idp_object - Delete users/groups/machines from the Identity Provider using object name or uid.
 - check_point.mgmt.cp_mgmt_delete_outbound_inspection_certificate - Delete outbound-inspection-certificate
 - check_point.mgmt.cp_mgmt_external_trusted_ca - Manages external-trusted-ca objects on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_external_trusted_ca_facts - Get external-trusted-ca objects facts on Checkpoint over Web Services API
@@ -48,6 +78,8 @@ New Modules
 - check_point.mgmt.cp_mgmt_import_outbound_inspection_certificate - Import Outbound Inspection certificate for HTTPS inspection.
 - check_point.mgmt.cp_mgmt_infinity_idp_facts - Get Infinity Identity Provider objects facts from the Infinity Portal.
 - check_point.mgmt.cp_mgmt_infinity_idp_object_facts - Retrieve users/groups/machines objects facts from the Identity Provider.
+- check_point.mgmt.cp_mgmt_limit - Manages limit objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_limit_facts - Get limit objects facts on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_mobile_access_profile_rule - Manages mobile-access-profile-rule objects on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_mobile_access_profile_rule_facts - Get mobile-access-profile-rule objects facts on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_mobile_access_profile_section - Manages mobile-access-profile-section objects on Checkpoint over Web Services API
@@ -63,16 +95,34 @@ New Modules
 - check_point.mgmt.cp_mgmt_opsec_trusted_ca - Manages opsec-trusted-ca objects on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_opsec_trusted_ca_facts - Get opsec-trusted-ca objects facts on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_outbound_inspection_certificate_facts - Get outbound-inspection-certificate objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_override_categorization - Manages override-categorization objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_override_categorization_facts - Get override-categorization objects facts on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_passcode_profile - Manages passcode-profile objects on Checkpoint over Web Services API
 - check_point.mgmt.cp_mgmt_passcode_profile_facts - Get passcode-profile objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_cifs - Manages resource-cifs objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_cifs_facts - Get resource-cifs objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_ftp - Manages resource-ftp objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_ftp_facts - Get resource-ftp objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_smtp - Manages resource-smtp objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_smtp_facts - Get resource-smtp objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_uri - Manages resource-uri objects on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_resource_uri_facts - Get resource-uri objects facts on Checkpoint over Web Services API
+- check_point.mgmt.cp_mgmt_set_app_control_advanced_settings - Edit Application Control & URL Filtering Blades' Settings.
+- check_point.mgmt.cp_mgmt_set_content_awareness_advanced_settings - Edit Content Awareness Blades' Settings.
 - check_point.mgmt.cp_mgmt_set_cp_trusted_ca_certificate - Edit existing Check Point trusted CA certificate using name or uid.
 - check_point.mgmt.cp_mgmt_set_gateway_global_use - Enable or disable global usage on a specific target.
 - check_point.mgmt.cp_mgmt_set_internal_trusted_ca - Edit existing Internal CA object.
 - check_point.mgmt.cp_mgmt_set_outbound_inspection_certificate - Edit outbound-inspection-certificate
+- check_point.mgmt.cp_mgmt_show_app_control_advanced_settings - Show Application Control & URL Filtering Blades' Settings.
+- check_point.mgmt.cp_mgmt_show_content_awareness_advanced_settings - Show Content Awareness Blades' Settings.
+- check_point.mgmt.cp_mgmt_show_gateway_capabilities - Show supported Check Point Gateway capabilities such as versions, hardwares, platforms and blades.
 - check_point.mgmt.cp_mgmt_show_gateway_global_use - Show global usage of a specific target.
 - check_point.mgmt.cp_mgmt_show_internal_trusted_ca - Retrieve existing Internal CA object.
+- check_point.mgmt.cp_mgmt_show_last_published_session - Shows the last published session.
 - check_point.mgmt.cp_mgmt_show_mobile_access_profile_section - Retrieve existing Mobile Access Profile section using section name or uid.
 - check_point.mgmt.cp_mgmt_show_mobile_access_section - Retrieve existing Mobile Access section using section name or uid.
+- check_point.mgmt.cp_mgmt_verify_management_license - Check how many Security Gateway objects the Management Server license supports.
+- check_point.mgmt.cp_mgmt_vsx_provisioning_tool - Run the VSX provisioning tool with the specified parameters.
 
 v5.2.3
 ======
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index c8330b4..121c1de 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -976,16 +976,71 @@ releases:
         name: cp_mgmt_add_outbound_inspection_certificate
         namespace: ''
       - description: Retrieve existing Check Point trusted CA certificate objects facts
-          on Checkpoint devices..
+          on Checkpoint devices.
         name: cp_mgmt_cp_trusted_ca_certificate_facts
         namespace: ''
       - description: Retrieve existing custom trusted CA certificate objects facts on
           Checkpoint devices.
         name: cp_mgmt_custom_trusted_ca_certificate_facts
         namespace: ''
+      - description: Manages data-type-compound-group objects on Checkpoint over Web Services
+          API
+        name: cp_mgmt_data_type_compound_group
+        namespace: ''
+      - description: Get data-type-compound-group objects facts on Checkpoint over Web Services
+          API
+        name: cp_mgmt_data_type_compound_group_facts
+        namespace: ''
+      - description: Manages data-type-file-attributes objects on Checkpoint over Web Services
+          API
+        name: cp_mgmt_data_type_file_attributes
+        namespace: ''
+      - description: Get data-type-file-attributes objects facts on Checkpoint over Web Services
+          API
+        name: cp_mgmt_data_type_file_attributes_facts
+        namespace: ''
+      - description: Get data-type-file-group objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_file_group_facts
+        namespace: ''
+      - description: Manages data-type-group objects on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_group
+        namespace: ''
+      - description: Get data-type-group objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_group_facts
+        namespace: ''
+      - description: Manages data-type-keywords objects on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_keywords
+        namespace: ''
+      - description: Get data-type-keywords objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_keywords_facts
+        namespace: ''
+      - description: Manages data-type-patterns objects on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_patterns
+        namespace: ''
+      - description: Get data-type-patterns objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_patterns_facts
+        namespace: ''
+      - description: Manages data-type-traditional-group objects on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_traditional_group
+        namespace: ''
+      - description: Get data-type-traditional-group objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_traditional_group_facts
+        namespace: ''
+      - description: Manages data-type-weighted-keywords objects on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_weighted_keywords
+        namespace: ''
+      - description: Get data-type-weighted-keywords objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_data_type_weighted_keywords_facts
+        namespace: ''
       - description: Delete existing custom trusted CA certificate using name or uid.
         name: cp_mgmt_delete_custom_trusted_ca_certificate
         namespace: ''
+      - description: Delete Infinity Identity Provider from the Infinity Portal using object name or uid.
+        name: cp_mgmt_delete_infinity_idp
+        namespace: ''
+      - description: Delete users/groups/machines from the Identity Provider using object name or uid.
+        name: cp_mgmt_delete_infinity_idp_object
+        namespace: ''
       - description: Delete outbound-inspection-certificate
         name: cp_mgmt_delete_outbound_inspection_certificate
         namespace: ''
@@ -1014,6 +1069,12 @@ releases:
           Provider.
         name: cp_mgmt_infinity_idp_object_facts
         namespace: ''
+      - description: Manages limit objects on Checkpoint over Web Services API
+        name: cp_mgmt_limit
+        namespace: ''
+      - description: Get limit objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_limit_facts
+        namespace: ''
       - description: Manages mobile-access-profile-rule objects on Checkpoint over Web
           Services API
         name: cp_mgmt_mobile_access_profile_rule
@@ -1073,6 +1134,12 @@ releases:
           over Web Services API
         name: cp_mgmt_outbound_inspection_certificate_facts
         namespace: ''
+      - description: Manages override-categorization objects on Checkpoint over Web Services API
+        name: cp_mgmt_override_categorization
+        namespace: ''
+      - description: Get override-categorization objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_override_categorization_facts
+        namespace: ''
       - description: Manages passcode-profile objects on Checkpoint over Web Services
           API
         name: cp_mgmt_passcode_profile
@@ -1081,6 +1148,36 @@ releases:
           API
         name: cp_mgmt_passcode_profile_facts
         namespace: ''
+      - description: Manages resource-cifs objects on Checkpoint over Web Services API
+        name: cp_mgmt_resource_cifs
+        namespace: ''
+      - description: Get resource-cifs objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_resource_cifs_facts
+        namespace: ''
+      - description: Manages resource-ftp objects on Checkpoint over Web Services API
+        name: cp_mgmt_resource_ftp
+        namespace: ''
+      - description: Get resource-ftp objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_resource_ftp_facts
+        namespace: ''
+      - description: Manages resource-smtp objects on Checkpoint over Web Services API
+        name: cp_mgmt_resource_smtp
+        namespace: ''
+      - description: Get resource-smtp objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_resource_smtp_facts
+        namespace: ''
+      - description: Manages resource-uri objects on Checkpoint over Web Services API
+        name: cp_mgmt_resource_uri
+        namespace: ''
+      - description: Get resource-uri objects facts on Checkpoint over Web Services API
+        name: cp_mgmt_resource_uri_facts
+        namespace: ''
+      - description: Edit Application Control & URL Filtering Blades' Settings.
+        name: cp_mgmt_set_app_control_advanced_settings
+        namespace: ''
+      - description: Edit Content Awareness Blades' Settings.
+        name: cp_mgmt_set_content_awareness_advanced_settings
+        namespace: ''
       - description: Edit existing Check Point trusted CA certificate using name or
           uid.
         name: cp_mgmt_set_cp_trusted_ca_certificate
@@ -1094,12 +1191,24 @@ releases:
       - description: Edit outbound-inspection-certificate
         name: cp_mgmt_set_outbound_inspection_certificate
         namespace: ''
+      - description: Show Application Control & URL Filtering Blades' Settings.
+        name: cp_mgmt_show_app_control_advanced_settings
+        namespace: ''
+      - description: Show Content Awareness Blades' Settings.
+        name: cp_mgmt_show_content_awareness_advanced_settings
+        namespace: ''
+      - description: Show supported Check Point Gateway capabilities such as versions, hardwares, platforms and blades.
+        name: cp_mgmt_show_gateway_capabilities
+        namespace: ''
       - description: Show global usage of a specific target.
         name: cp_mgmt_show_gateway_global_use
         namespace: ''
       - description: Retrieve existing Internal CA object.
         name: cp_mgmt_show_internal_trusted_ca
         namespace: ''
+      - description: Shows the last published session.
+        name: cp_mgmt_show_last_published_session
+        namespace: ''
       - description: Retrieve existing Mobile Access Profile section using section name
           or uid.
         name: cp_mgmt_show_mobile_access_profile_section
@@ -1107,18 +1216,32 @@ releases:
       - description: Retrieve existing Mobile Access section using section name or uid.
         name: cp_mgmt_show_mobile_access_section
         namespace: ''
+      - description: Check how many Security Gateway objects the Management Server license supports.
+        name: cp_mgmt_verify_management_license
+        namespace: ''
+      - description: Run the VSX provisioning tool with the specified parameters.
+        name: cp_mgmt_vsx_provisioning_tool
+        namespace: ''
     release_date: '2024-06-16'
   6.1.0:
     changes:
       release_summary: This is release 6.1.0 of ``check_point.mgmt``, released on
         2024-07-08.
     fragments:
-    - 6.1.0.yml
+      - 6.1.0.yml
     modules:
-    - description: Configure advanced settings for HTTPS Inspection.
-      name: cp_mgmt_set_https_advanced_settings
-      namespace: ''
-    - description: Show advanced settings for HTTPS Inspection.
-      name: cp_mgmt_show_https_advanced_settings
-      namespace: ''
+      - description: Configure advanced settings for HTTPS Inspection.
+        name: cp_mgmt_set_https_advanced_settings
+        namespace: ''
+      - description: Show advanced settings for HTTPS Inspection.
+        name: cp_mgmt_show_https_advanced_settings
+        namespace: ''
     release_date: '2024-07-08'
+  6.1.1:
+    changes:
+      bugfixes:
+        - module_utils/checkpoint.py - Remove usage of CertificateError causing failures in ansible-core 2.17.
+      release_summary: This is release 6.1.1 of ``check_point.mgmt``, released on 2023-08-12.
+    fragments:
+      - 6.1.1.yml
+    release_date: "2022-08-12"
diff --git a/galaxy.yml b/galaxy.yml
index 43c098a..3a5fb83 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: check_point
 name: mgmt
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 6.1.0
+version: 6.1.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
diff --git a/meta/runtime.yml b/meta/runtime.yml
index 531e865..a1b6a9f 100644
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -20,12 +20,6 @@ plugin_routing:
         warning_text: >
           cp_mgmt_delete_nat_rule will be removed in a future release of this collection.
           Use newer and updated module cp_mgmt_nat_rule with more functionality instead.
-    cp_mgmt_access_layer:
-      deprecation:
-        removal_date: "2024-11-01"
-        warning_text: >
-          cp_mgmt_access_layer will be removed in a future release of this collection.
-          Use newer and updated module cp_mgmt_access_layers with more functionality instead.
     cp_mgmt_show_task:
       deprecation:
         removal_date: "2024-11-01"
@@ -38,15 +32,3 @@ plugin_routing:
         warning_text: >
           cp_mgmt_show_tasks will be removed in a future release of this collection.
           Use newer and updated module cp_mgmt_task_facts instead.
-    cp_mgmt_host:
-      deprecation:
-        removal_date: "2024-11-01"
-        warning_text: >
-          cp_mgmt_host will be removed in a future release of this collection.
-          Use newer and updated module cp_mgmt_hosts with more functionality instead.
-    cp_mgmt_threat_layer:
-      deprecation:
-        removal_date: "2024-11-01"
-        warning_text: >
-          cp_mgmt_threat_layer will be removed in a future release of this collection.
-          Use newer and updated module cp_mgmt_threat_layers with more functionality instead.
diff --git a/plugins/module_utils/checkpoint.py b/plugins/module_utils/checkpoint.py
index f3705c6..f6701d4 100644
--- a/plugins/module_utils/checkpoint.py
+++ b/plugins/module_utils/checkpoint.py
@@ -32,7 +32,6 @@
 
 import time
 from ansible.module_utils.six import iteritems
-from ansible.module_utils.urls import CertificateError
 from ansible.module_utils.connection import ConnectionError
 from ansible.module_utils.connection import Connection
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import (
@@ -1871,8 +1870,6 @@ def _httpapi_error_handle(self, api_obj, state, **kwargs):
                     )
         except ConnectionError as e:
             raise _fail_json("connection error occurred: {0}".format(e))
-        except CertificateError as e:
-            raise _fail_json("certificate error occurred: {0}".format(e))
         except ValueError as e:
             raise _fail_json("certificate not found: {0}".format(e))
         # This fn. will return both code and response, once all of the available modules
diff --git a/plugins/modules/cp_mgmt_access_layer.py b/plugins/modules/cp_mgmt_access_layer.py
index 46bdab5..70b2212 100644
--- a/plugins/modules/cp_mgmt_access_layer.py
+++ b/plugins/modules/cp_mgmt_access_layer.py
@@ -36,10 +36,6 @@
   - All operations are performed over Web Services API.
 version_added: "1.0.0"
 author: "Or Soffer (@chkp-orso)"
-deprecated:
-  alternative: cp_mgmt_access_layers
-  why: Newer and updated modules released with more functionality.
-  removed_at_date: '2024-11-01'
 options:
   name:
     description:
diff --git a/plugins/modules/cp_mgmt_data_type_file_attributes_facts.py b/plugins/modules/cp_mgmt_data_type_file_attributes_facts.py
index 89788eb..7bae387 100644
--- a/plugins/modules/cp_mgmt_data_type_file_attributes_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_file_attributes_facts.py
@@ -126,7 +126,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-file-attributes"
     api_call_object_plural_version = "data-types-file-attributes"
diff --git a/plugins/modules/cp_mgmt_data_type_file_group_facts.py b/plugins/modules/cp_mgmt_data_type_file_group_facts.py
index 74e76f7..8c5da9d 100644
--- a/plugins/modules/cp_mgmt_data_type_file_group_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_file_group_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-file-group"
     api_call_object_plural_version = "data-type-file-groups"
diff --git a/plugins/modules/cp_mgmt_data_type_group_facts.py b/plugins/modules/cp_mgmt_data_type_group_facts.py
index 74a3100..58a8268 100644
--- a/plugins/modules/cp_mgmt_data_type_group_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_group_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-group"
     api_call_object_plural_version = "data-type-groups"
diff --git a/plugins/modules/cp_mgmt_data_type_keywords.py b/plugins/modules/cp_mgmt_data_type_keywords.py
index d703640..8e6e414 100644
--- a/plugins/modules/cp_mgmt_data_type_keywords.py
+++ b/plugins/modules/cp_mgmt_data_type_keywords.py
@@ -134,9 +134,9 @@ def main():
     argument_spec = dict(
         name=dict(type='str', required=True),
         description=dict(type='str'),
-        keywords=dict(type='list', elements='str'),
+        keywords=dict(type='list', elements='str', no_log=False),
         data_match_threshold=dict(type='str', choices=['all-keywords', 'min-keywords']),
-        min_number_of_keywords=dict(type='int'),
+        min_number_of_keywords=dict(type='int', no_log=False),
         tags=dict(type='list', elements='str'),
         color=dict(type='str', choices=['aquamarine', 'black', 'blue', 'crete blue', 'burlywood', 'cyan', 'dark green',
                                         'khaki', 'orchid', 'dark orange', 'dark sea green', 'pink', 'turquoise', 'dark blue', 'firebrick', 'brown',
diff --git a/plugins/modules/cp_mgmt_data_type_keywords_facts.py b/plugins/modules/cp_mgmt_data_type_keywords_facts.py
index ca9be2b..7019bf1 100644
--- a/plugins/modules/cp_mgmt_data_type_keywords_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_keywords_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-keywords"
     api_call_object_plural_version = "data-types-keywords"
diff --git a/plugins/modules/cp_mgmt_data_type_patterns_facts.py b/plugins/modules/cp_mgmt_data_type_patterns_facts.py
index 46c9537..c35f280 100644
--- a/plugins/modules/cp_mgmt_data_type_patterns_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_patterns_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-patterns"
     api_call_object_plural_version = "data-types-patterns"
diff --git a/plugins/modules/cp_mgmt_data_type_traditional_group_facts.py b/plugins/modules/cp_mgmt_data_type_traditional_group_facts.py
index ce45b38..7c3d5a8 100644
--- a/plugins/modules/cp_mgmt_data_type_traditional_group_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_traditional_group_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-traditional-group"
     api_call_object_plural_version = "data-type-traditional-groups"
diff --git a/plugins/modules/cp_mgmt_data_type_weighted_keywords.py b/plugins/modules/cp_mgmt_data_type_weighted_keywords.py
index 12fe882..6f32654 100644
--- a/plugins/modules/cp_mgmt_data_type_weighted_keywords.py
+++ b/plugins/modules/cp_mgmt_data_type_weighted_keywords.py
@@ -152,8 +152,8 @@
 def main():
     argument_spec = dict(
         name=dict(type='str', required=True),
-        weighted_keywords=dict(type='list', elements='dict', options=dict(
-            keyword=dict(type='str'),
+        weighted_keywords=dict(type='list', elements='dict', no_log=False, options=dict(
+            keyword=dict(type='str', no_log=False),
             weight=dict(type='int'),
             max_weight=dict(type='int'),
             regex=dict(type='bool')
diff --git a/plugins/modules/cp_mgmt_data_type_weighted_keywords_facts.py b/plugins/modules/cp_mgmt_data_type_weighted_keywords_facts.py
index 187274f..9437ebb 100644
--- a/plugins/modules/cp_mgmt_data_type_weighted_keywords_facts.py
+++ b/plugins/modules/cp_mgmt_data_type_weighted_keywords_facts.py
@@ -126,7 +126,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "data-type-weighted-keywords"
     api_call_object_plural_version = "data-types-weighted-keywords"
diff --git a/plugins/modules/cp_mgmt_host.py b/plugins/modules/cp_mgmt_host.py
index acceffd..000fdd5 100644
--- a/plugins/modules/cp_mgmt_host.py
+++ b/plugins/modules/cp_mgmt_host.py
@@ -36,10 +36,6 @@
   - All operations are performed over Web Services API.
 version_added: "1.0.0"
 author: "Or Soffer (@chkp-orso)"
-deprecated:
-  alternative: cp_mgmt_hosts
-  why: Newer and updated modules released with more functionality.
-  removed_at_date: '2024-11-01'
 options:
   name:
     description:
diff --git a/plugins/modules/cp_mgmt_limit_facts.py b/plugins/modules/cp_mgmt_limit_facts.py
index f7a06ef..b2093d1 100644
--- a/plugins/modules/cp_mgmt_limit_facts.py
+++ b/plugins/modules/cp_mgmt_limit_facts.py
@@ -125,7 +125,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "limit"
     api_call_object_plural_version = "limits"
diff --git a/plugins/modules/cp_mgmt_resource_cifs_facts.py b/plugins/modules/cp_mgmt_resource_cifs_facts.py
index c341a8d..ed7416e 100644
--- a/plugins/modules/cp_mgmt_resource_cifs_facts.py
+++ b/plugins/modules/cp_mgmt_resource_cifs_facts.py
@@ -128,7 +128,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "resource-cifs"
     api_call_object_plural_version = "resources-cifs"
diff --git a/plugins/modules/cp_mgmt_resource_ftp_facts.py b/plugins/modules/cp_mgmt_resource_ftp_facts.py
index 88ea475..2534b09 100644
--- a/plugins/modules/cp_mgmt_resource_ftp_facts.py
+++ b/plugins/modules/cp_mgmt_resource_ftp_facts.py
@@ -128,7 +128,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "resource-ftp"
     api_call_object_plural_version = "resources-ftp"
diff --git a/plugins/modules/cp_mgmt_resource_smtp_facts.py b/plugins/modules/cp_mgmt_resource_smtp_facts.py
index 077325d..2a7df43 100644
--- a/plugins/modules/cp_mgmt_resource_smtp_facts.py
+++ b/plugins/modules/cp_mgmt_resource_smtp_facts.py
@@ -128,7 +128,7 @@ def main():
     )
     argument_spec.update(checkpoint_argument_spec_for_facts)
 
-    module = AnsibleModule(argument_spec=argument_spec)
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     api_call_object = "resource-smtp"
     api_call_object_plural_version = "resources-smtp"
diff --git a/plugins/modules/cp_mgmt_threat_layer.py b/plugins/modules/cp_mgmt_threat_layer.py
index 45d4e8e..4af22af 100644
--- a/plugins/modules/cp_mgmt_threat_layer.py
+++ b/plugins/modules/cp_mgmt_threat_layer.py
@@ -36,10 +36,6 @@
   - All operations are performed over Web Services API.
 version_added: "1.0.0"
 author: "Or Soffer (@chkp-orso)"
-deprecated:
-  alternative: cp_mgmt_threat_layers
-  why: Newer and updated modules released with more functionality.
-  removed_at_date: '2024-11-01'
 options:
   name:
     description:
diff --git a/plugins/modules/cp_mgmt_vsx_provisioning_tool.py b/plugins/modules/cp_mgmt_vsx_provisioning_tool.py
index a08f318..2c977c7 100644
--- a/plugins/modules/cp_mgmt_vsx_provisioning_tool.py
+++ b/plugins/modules/cp_mgmt_vsx_provisioning_tool.py
@@ -30,7 +30,7 @@
 module: cp_mgmt_vsx_provisioning_tool
 short_description: Run the VSX provisioning tool with the specified parameters.
 description:
-  - Run the VSX provisioning tool with the specified parameters. Note: An automatic session publish is part of all the operations in this API.
+  - Run the VSX provisioning tool with the specified parameters. Note - An automatic session publish is part of all the operations in this API.
   - All operations are performed over Web Services API.
 version_added: "6.0.0"
 author: "Eden Brillant (@chkp-edenbr)"