diff --git a/pallets/governance/src/application.rs b/pallets/governance/src/application.rs
index 75cec30..c8e72bb 100644
--- a/pallets/governance/src/application.rs
+++ b/pallets/governance/src/application.rs
@@ -19,13 +19,15 @@ pub struct AgentApplication<T: crate::Config> {
     pub data: BoundedVec<u8, T::MaxApplicationDataLength>,
     pub cost: BalanceOf<T>,
     pub expires_at: Block,
+    pub action: ApplicationAction,
     pub status: ApplicationStatus,
 }
 
-// pub enum ProposalAction {
-//     Add,
-//     Remove,
-// }
+#[derive(DebugNoBound, Decode, Encode, TypeInfo, MaxEncodedLen, PartialEq, Eq)]
+pub enum ApplicationAction {
+    Add,
+    Remove,
+}
 
 #[derive(DebugNoBound, Decode, Encode, TypeInfo, MaxEncodedLen, PartialEq, Eq)]
 pub enum ApplicationStatus {
@@ -38,9 +40,12 @@ pub fn submit_application<T: crate::Config>(
     payer: AccountIdOf<T>,
     agent_key: AccountIdOf<T>,
     data: Vec<u8>,
+    removing: bool,
 ) -> DispatchResult {
-    if whitelist::is_whitelisted::<T>(&agent_key) {
+    if !removing && whitelist::is_whitelisted::<T>(&agent_key) {
         return Err(crate::Error::<T>::AlreadyWhitelisted.into());
+    } else if whitelist::is_whitelisted::<T>(&agent_key) {
+        return Err(crate::Error::<T>::NotWhitelisted.into());
     }
 
     let config = crate::GlobalGovernanceConfig::<T>::get();
@@ -77,6 +82,12 @@ pub fn submit_application<T: crate::Config>(
         last_id
     });
 
+    let action = if removing {
+        ApplicationAction::Remove
+    } else {
+        ApplicationAction::Add
+    };
+
     let application = AgentApplication::<T> {
         id: next_id,
         payer_key: payer,
@@ -85,6 +96,7 @@ pub fn submit_application<T: crate::Config>(
         cost,
         expires_at,
         status: ApplicationStatus::Open,
+        action,
     };
 
     crate::AgentApplications::<T>::insert(next_id, application);