diff --git a/src/database/Entity.ts b/src/database/Entity.ts
index a1338ee..98c5903 100644
--- a/src/database/Entity.ts
+++ b/src/database/Entity.ts
@@ -2,19 +2,19 @@ import { Guild, GuildManager, GuildMember, GuildMemberManager, User, UserManager
 
 export type EntityType = "user" | "guild" | "member";
 
-export type Entity<E extends EntityType>
-    = E extends "user" ? User
-    : E extends "guild" ? Guild
-    : E extends "member" ? GuildMember
-    : never;
+export type Entity<E extends EntityType> = {
+    "user": User,
+    "guild": Guild,
+    "member": GuildMember,
+}[E];
 
 export type AnyEntity = Entity<EntityType>;
 
-export type EntityManager<E extends EntityType>
-    = E extends "user" ? UserManager
-    : E extends "guild" ? GuildManager
-    : E extends "member" ? GuildMemberManager
-    : never;
+export type EntityManager<E extends EntityType> = {
+    "user": UserManager,
+    "guild": GuildManager,
+    "member": GuildMemberManager,
+}[E];
 
 export function checkEntityType<E extends EntityType>(entity: Entity<any>, expectedType: E): entity is Entity<E> {
     switch (expectedType) {
diff --git a/src/database/json/Handler.ts b/src/database/json/Handler.ts
index 2c7d3d2..0bdda5d 100644
--- a/src/database/json/Handler.ts
+++ b/src/database/json/Handler.ts
@@ -58,7 +58,7 @@ export const createJsonDatabaseHandler = (options: JsonHandlerOptions): CreateDa
             }
 
             variables ??= {};
-            const selected = [];
+            const selected: Entity<E>[] = [];
 
             const defaultSatate = {} as any;
             await database.bot.importer.forEach('states', state => {
diff --git a/src/database/selector/Operator.ts b/src/database/selector/Operator.ts
index ea86002..798e4e2 100644
--- a/src/database/selector/Operator.ts
+++ b/src/database/selector/Operator.ts
@@ -22,7 +22,7 @@ export interface QueryOperators<E extends EntityType, Vars extends SelectorVars>
     readonly var: <T>(name: ExpressionVariable<Vars, T>['name']) => ExpressionVariable<Vars, T>;
 }
 
-export const QueryOperators = <QueryOperators<EntityType, any>>Object.freeze({
+export const QueryOperators = Object.freeze(<QueryOperators<EntityType, any>>{
     gt: (l, r) => new ComparisonExpression('gt' as any, l, r),
     gte: (l, r) => new ComparisonExpression('gte' as any, l, r),
     lt: (l, r) => new ComparisonExpression('lt' as any, l, r),
diff --git a/src/database/selector/Selector.ts b/src/database/selector/Selector.ts
index 85a716d..abd58a1 100644
--- a/src/database/selector/Selector.ts
+++ b/src/database/selector/Selector.ts
@@ -38,7 +38,7 @@ export class Selector<E extends EntityType, Vars extends SelectorVars = {}> {
     }
 }
 
-function checkExpression<E extends EntityType>(selector: Selector<E, any>, expression?: AnyExpression<EntityType, any>) {
+function checkExpression<E extends EntityType>(selector: Selector<E, any>, expression?: AnyExpression<E, any>) {
     expression ??= selector.expression;
 
     if (expression instanceof ComparisonExpression) {
diff --git a/src/database/state/accessFabrics/JsonModel.ts b/src/database/state/accessFabrics/JsonModel.ts
index e978e1f..f501760 100644
--- a/src/database/state/accessFabrics/JsonModel.ts
+++ b/src/database/state/accessFabrics/JsonModel.ts
@@ -2,7 +2,7 @@ import { assert } from "../../../utils/index.js";
 import { StateAccess } from "../State.js";
 import { jsonAccess } from "./Json.js";
 
-export const jsonModelAccess = <T>(modelConstructor: new () => T) => (access: StateAccess<string>) => {
+export const jsonModelAccess = <T extends {}>(modelConstructor: new () => T) => (access: StateAccess<string>) => {
     const jAccess = jsonAccess<T>(access);
 
     return {