diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
index afe157e51..780b1bc86 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
@@ -77,7 +77,7 @@
                             org.wso2.extension.siddhi.execution.json.*
                         </Export-Package>
                         <Import-Package>
-                            org.json,
+                            org.json;version="${orbit.version.json.range}",
                             org.wso2.siddhi.core.*,
                             org.wso2.siddhi.query.api.*,
                         </Import-Package>
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
index a66db4e8d..cbd5278f3 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
@@ -208,17 +208,6 @@
 									org.wso2.carbon.identity.carbon.auth.jwt:org.wso2.carbon.identity.authenticator.signedjwt:${identity.carbon.auth.jwt.version}
 								</bundleDef>
                             </bundles>
-                            <importFeatures>
-                                <importFeatureDef>
-                                    org.wso2.carbon.event.output.adapter.server:${carbon.analytics.common.version}
-                                </importFeatureDef>
-                                <importFeatureDef>
-                                    org.wso2.carbon.event.input.adapter.server:${carbon.analytics.common.version}
-                                </importFeatureDef>
-                                <importFeatureDef>
-                                    org.wso2.carbon.identity.jwt.client.extension:${carbon.devicemgt.version}
-                                </importFeatureDef>
-                            </importFeatures>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index ac1c34096..566ca7b2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1215,6 +1215,7 @@
 
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range>
+		<orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range>
         <json.path.version>0.9.1</json.path.version>
         <json-simple.version>1.1.wso2v1</json-simple.version>
         <commons-collections.version>3.2.2</commons-collections.version>