diff --git a/contracts/service-provider-directory/src/contract.rs b/contracts/service-provider-directory/src/contract.rs
index c87e10555b..08b524f8e6 100644
--- a/contracts/service-provider-directory/src/contract.rs
+++ b/contracts/service-provider-directory/src/contract.rs
@@ -37,7 +37,7 @@ pub fn execute(
     use ExecuteMsg::*;
 
     match msg {
-        Announce { client_address, whitelist, owner } => exec::announce(_deps, _info, client_address, whitelist, owner ),
+        Announce { client_address, standard_whitelist, owner } => exec::announce(_deps, _info, client_address, standard_whitelist, owner ),
         Delete { client_address } => exec::delete(_deps, _info, client_address), // TODO fix in line with the comment 
         UpdateScore { client_address, new_score } => exec::update_score(_deps, _info, client_address, new_score)
     }
@@ -50,13 +50,13 @@ mod exec {
         deps: DepsMut, 
         info: MessageInfo, 
         client_address: String, 
-        whitelist: Vec<String>, 
+        standard_whitelist: bool, 
         owner: Addr 
     ) -> Result<Response, ContractError> {
         
         let new_service = Service { 
             client_address: client_address.clone(), 
-            whitelist, 
+            standard_whitelist, 
             uptime_score: 0, // init @ 0 - no score on new service 
             owner
         }; 
@@ -217,7 +217,7 @@ mod tests {
                 addr.clone(), 
                 &ExecuteMsg::Announce {
                     client_address: "nymAddress".to_owned(),
-                    whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+                    standard_whitelist: true, 
                     owner: Addr::unchecked("owner") 
                 }, 
                 &[],
@@ -240,7 +240,7 @@ mod tests {
 
         let test_service: Service = Service {
             client_address: "nymAddress".to_string(), 
-            whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+            standard_whitelist: true, 
             owner: Addr::unchecked("owner"),
             uptime_score: 0
         };
@@ -282,7 +282,7 @@ mod tests {
                 addr.clone(), 
                 &ExecuteMsg::Announce {
                     client_address: "nymAddress".to_string(), 
-                    whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+                    standard_whitelist: true, 
                     owner: Addr::unchecked("owner") 
                 }, 
                 &[],
@@ -295,7 +295,7 @@ mod tests {
     
             let test_service: Service = Service {
                 client_address: "nymAddress".to_string(), 
-                whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+                standard_whitelist: true, 
                 owner: Addr::unchecked("owner"),
                 uptime_score: 0
             };
@@ -372,7 +372,7 @@ mod tests {
                 addr.clone(), 
                 &ExecuteMsg::Announce {
                     client_address: "nymAddress".to_string(), 
-                    whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+                    standard_whitelist: true, 
                     owner: Addr::unchecked("owner") 
                 }, 
                 &[],
@@ -385,7 +385,7 @@ mod tests {
     
             let test_service: Service = Service {
                 client_address: "nymAddress".to_string(), 
-                whitelist: vec!["domain.url".to_owned(), "domain2.url".to_owned()], 
+                standard_whitelist: true, 
                 owner: Addr::unchecked("owner"),
                 uptime_score: 0
             };
diff --git a/contracts/service-provider-directory/src/msg.rs b/contracts/service-provider-directory/src/msg.rs
index b43755e6ff..8302d8ffe8 100644
--- a/contracts/service-provider-directory/src/msg.rs
+++ b/contracts/service-provider-directory/src/msg.rs
@@ -21,7 +21,7 @@ pub struct InstantiateMsg {
 
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
 pub enum ExecuteMsg {
-    Announce { client_address: String, whitelist: Vec<String>, owner: Addr },
+    Announce { client_address: String, standard_whitelist: bool, owner: Addr },
     Delete { client_address: String }, 
     UpdateScore { client_address: String, new_score: i8 }
 }
diff --git a/contracts/service-provider-directory/src/state.rs b/contracts/service-provider-directory/src/state.rs
index 58e4a41941..b71b2fdf57 100644
--- a/contracts/service-provider-directory/src/state.rs
+++ b/contracts/service-provider-directory/src/state.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
 pub struct Service {
     pub client_address: String, 
-    pub whitelist: Vec<String>, 
+    pub standard_whitelist: bool,
     pub uptime_score: u8,
     pub owner: Addr
 }