diff --git a/contracts/axone-dataverse/src/contract.rs b/contracts/axone-dataverse/src/contract.rs
index 278b507b..1b0b067f 100644
--- a/contracts/axone-dataverse/src/contract.rs
+++ b/contracts/axone-dataverse/src/contract.rs
@@ -142,9 +142,8 @@ mod tests {
     };
     use crate::testutil::testutil::read_test_data;
     use axone_cognitarium::msg::{
-        DataFormat, Head, Node, Results, SelectItem, SelectQuery, SelectResponse,
-        SimpleWhereCondition, TriplePattern, Value, VarOrNamedNode, VarOrNode, VarOrNodeOrLiteral,
-        WhereCondition, IRI,
+        DataFormat, Head, Node, Results, SelectItem, SelectQuery, SelectResponse, TriplePattern,
+        Value, VarOrNamedNode, VarOrNode, VarOrNodeOrLiteral, WhereClause, IRI,
     };
     use cosmwasm_std::testing::{message_info, mock_dependencies, mock_env};
     use cosmwasm_std::{
@@ -304,15 +303,15 @@ mod tests {
                             prefixes: vec![],
                             limit: Some(1u32),
                             select: vec![SelectItem::Variable("p".to_string())],
-                            r#where: vec![WhereCondition::Simple(
-                                SimpleWhereCondition::TriplePattern(TriplePattern {
+                            r#where: WhereClause::Bgp {
+                                patterns: vec![TriplePattern {
                                     subject: VarOrNode::Node(Node::NamedNode(IRI::Full(
                                         "http://example.edu/credentials/3732".to_string(),
                                     ))),
                                     predicate: VarOrNamedNode::Variable("p".to_string()),
                                     object: VarOrNodeOrLiteral::Variable("o".to_string()),
-                                })
-                            )],
+                                }]
+                            },
                         }
                     })
                 );
diff --git a/contracts/axone-dataverse/src/registrar/registry.rs b/contracts/axone-dataverse/src/registrar/registry.rs
index ad500bd4..0057000f 100644
--- a/contracts/axone-dataverse/src/registrar/registry.rs
+++ b/contracts/axone-dataverse/src/registrar/registry.rs
@@ -2,8 +2,8 @@ use crate::registrar::credential::DataverseCredential;
 use crate::state::DATAVERSE;
 use crate::ContractError;
 use axone_cognitarium::msg::{
-    DataFormat, Node, SelectItem, SelectQuery, SimpleWhereCondition, TriplePattern, VarOrNamedNode,
-    VarOrNode, VarOrNodeOrLiteral, WhereCondition, IRI,
+    DataFormat, Node, SelectItem, SelectQuery, TriplePattern, VarOrNamedNode, VarOrNode,
+    VarOrNodeOrLiteral, WhereClause, IRI,
 };
 use axone_cognitarium_client::CognitariumClient;
 use cosmwasm_std::{DepsMut, StdResult, Storage, WasmMsg};
@@ -36,15 +36,15 @@ impl ClaimRegistrar {
                 prefixes: vec![],
                 limit: Some(1u32),
                 select: vec![SelectItem::Variable("p".to_string())],
-                r#where: vec![WhereCondition::Simple(SimpleWhereCondition::TriplePattern(
-                    TriplePattern {
+                r#where: WhereClause::Bgp {
+                    patterns: vec![TriplePattern {
                         subject: VarOrNode::Node(Node::NamedNode(IRI::Full(
                             credential.id.to_string(),
                         ))),
                         predicate: VarOrNamedNode::Variable("p".to_string()),
                         object: VarOrNodeOrLiteral::Variable("o".to_string()),
-                    },
-                ))],
+                    }],
+                },
             },
         )?;