diff --git a/src/types/trades.ts b/src/types/trades.ts
index 6b2477cc..3ec6282b 100644
--- a/src/types/trades.ts
+++ b/src/types/trades.ts
@@ -41,7 +41,10 @@ export interface Trade {
   stake_amount: number;
   strategy?: string;
   exchange?: string;
+  /** @deprecated - Replaced by enter_tag with 2.x */
   buy_tag?: string;
+  /** Replaces buy_tag with version 2.x */
+  enter_tag?: string;
 
   timeframe: string;
   open_rate: number;
diff --git a/src/types/types.ts b/src/types/types.ts
index 5f33a560..9332ca61 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -75,11 +75,17 @@ export interface UnfilledTimeout {
 }
 
 export interface OrderTypes {
-  buy: string;
-  sell: string;
-  emergencysell?: string;
+  buy?: string;
+  sell?: string;
   forcesell?: string;
   forcebuy?: string;
+  emergencysell?: string;
+  // TODO: this will need updating for futures, removal of the above, and mandatory of certain values.
+  entry?: string;
+  exit?: string;
+  emergencyexit?: string;
+  forcesexit?: string;
+  forceentry?: string;
   stoploss: string;
   stoploss_on_exchange: boolean;
   stoploss_on_exchange_interval: number;
@@ -106,7 +112,8 @@ export interface BotState {
   /** Api version - was not provided prior to 1.1 (or 2021.11) */
   api_version?: number;
   dry_run: boolean;
-  trading_mode?: string;
+  /** Futures, margin or spot */
+  trading_mode?: 'futures' | 'margin' | 'spot';
   short_allowed?: boolean;
   state: BotStates;
   runmode: RunModes;