diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f64ad3..92469398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,22 @@ All changes in this project will be noted in this file.
     ```sql
     USE keyspace:table
     ```
+- **Entity respecting actions**:
+
+  - **`FLUSHDB`**: To flush all the data in a specific table, run:
+    ```sql
+    FLUSHDB <entity>
+    ```
+  - **`DBSIZE`**: To see the number of entries in a specific table, run:
+    ```sql
+    DBSIZE <entity>
+    ```
+  - **`LSKEYS`**:
+    - `LSKEYS` will return keys from the current table
+    - `LSKEYS <count>` will return _count_ keys from the current table
+    - `LSKEYS <entity>` will return keys from the given table
+    - `LSKEYS <entity> <count>` will return _count_ keys from the given table
+
 - TLS port can now be set to a custom port via CLI arguments
 
 ### Fixes
diff --git a/server/src/actions/lskeys.rs b/server/src/actions/lskeys.rs
index 645f9fc8..0b4ea02c 100644
--- a/server/src/actions/lskeys.rs
+++ b/server/src/actions/lskeys.rs
@@ -24,28 +24,53 @@
  *
 */
 
+use crate::corestore::memstore::DdlError;
 use crate::dbnet::connection::prelude::*;
 use crate::resp::BytesWrapper;
 use bytes::Bytes;
 
+const DEFAULT_COUNT: usize = 10;
+
 action!(
     /// Run an `LSKEYS` query
     fn lskeys(handle: &crate::corestore::Corestore, con: &mut T, mut act: ActionIter) {
-        err_if_len_is!(act, con, gt 1);
-        let item_count = if let Some(cnt) = act.next() {
-            if let Ok(cnt) = String::from_utf8_lossy(&cnt).parse::<usize>() {
-                cnt
+        err_if_len_is!(act, con, gt 2);
+        let (table, count) = if act.len() == 0 {
+            (get_tbl!(handle, con), DEFAULT_COUNT)
+        } else if act.len() == 1 {
+            // two args, could either be count or an entity
+            let nextret = unsafe { act.next().unsafe_unwrap() };
+            if unsafe { nextret.get_unchecked(0) }.is_ascii_digit() {
+                // noice, this is a number; let's try to parse it
+                let count = if let Ok(cnt) = String::from_utf8_lossy(&nextret).parse::<usize>() {
+                    cnt
+                } else {
+                    return con.write_response(responses::groups::WRONGTYPE_ERR).await;
+                };
+                (get_tbl!(handle, con), count)
             } else {
-                return con.write_response(responses::groups::WRONGTYPE_ERR).await;
+                // sigh, an entity
+                let entity = handle_entity!(con, nextret);
+                (get_tbl!(entity, handle, con), DEFAULT_COUNT)
             }
         } else {
-            10
+            // an entity and a count, gosh this fella is really trying us
+            let entity_ret = unsafe { act.next().unsafe_unwrap() };
+            let count_ret = unsafe { act.next().unsafe_unwrap() };
+            let entity = handle_entity!(con, entity_ret);
+            let count = if let Ok(cnt) = String::from_utf8_lossy(&count_ret).parse::<usize>() {
+                cnt
+            } else {
+                return con.write_response(responses::groups::WRONGTYPE_ERR).await;
+            };
+            (get_tbl!(entity, handle, con), count)
         };
-        let items: Vec<Bytes>;
-        {
-            let reader = kve!(con, handle);
-            items = reader.__get_inner_ref().get_keys(item_count);
-        }
+        let kve = match table.get_kvstore() {
+            Ok(kv) => kv,
+            Err(DdlError::WrongModel) => return conwrite!(con, responses::groups::WRONG_MODEL),
+            Err(_) => unsafe { impossible!() },
+        };
+        let items: Vec<Bytes> = kve.__get_inner_ref().get_keys(count);
         con.write_flat_array_length(items.len()).await?;
         for item in items {
             con.write_response(BytesWrapper(item)).await?;
diff --git a/server/src/corestore/mod.rs b/server/src/corestore/mod.rs
index 18b139d4..bcad7463 100644
--- a/server/src/corestore/mod.rs
+++ b/server/src/corestore/mod.rs
@@ -187,8 +187,8 @@ impl Corestore {
             _ => unsafe { impossible!() },
         }
     }
-    pub fn get_ctable(&self) -> Option<&Arc<Table>> {
-        self.ctable.as_ref()
+    pub fn get_ctable(&self) -> Option<Arc<Table>> {
+        self.ctable.clone()
     }
 
     /// Get the key/value store
diff --git a/server/src/tests/kvengine.rs b/server/src/tests/kvengine.rs
index 8701e959..48d1c59e 100644
--- a/server/src/tests/kvengine.rs
+++ b/server/src/tests/kvengine.rs
@@ -1061,18 +1061,11 @@ mod __private {
             panic!("Expected flat string array");
         }
     }
-    async fn test_lskeys_wrongtype() {
-        query.push("lskeys");
-        query.push("abcdefg");
-        assert_eq!(
-            con.run_simple_query(&query).await.unwrap(),
-            Response::Item(Element::RespCode(RespCode::Wrongtype))
-        );
-    }
     async fn test_lskeys_syntax_error() {
         query.push("lskeys");
         query.push("abcdefg");
         query.push("hijklmn");
+        query.push("riufrif");
         assert_eq!(
             con.run_simple_query(&query).await.unwrap(),
             Response::Item(Element::RespCode(RespCode::ActionError))