diff --git a/edit_flow.php b/edit_flow.php
index 50e4094b..77adf6a9 100644
--- a/edit_flow.php
+++ b/edit_flow.php
@@ -53,6 +53,7 @@ function _ef_print_php_version_admin_notice() {
 define( 'EDIT_FLOW_SETTINGS_PAGE' , add_query_arg( 'page', 'ef-settings', get_admin_url( null, 'admin.php' ) ) );
 
 // Core class
+#[\AllowDynamicProperties]
 class edit_flow {
 
 	// Unique identified added as a prefix to all options
@@ -83,51 +84,6 @@ class edit_flow {
 	 */
 	public $helpers;
 
-	/**
-	 * @var EF_Calendar
-	 */
-	public $calendar;
-
-	/**
-	 * @var EF_Custom_Status
-	 */
-	public $custom_status;
-
-	/**
-	 * @var EF_Dashboard
-	 */
-	public $dashboard;
-
-	/**
-	 * @var EF_Settings
-	 */
-	public $settings;
-
-	/**
-	 * @var EF_Notifications
-	 */
-	public $notifications;
-
-	/**
-	 * @var EF_Story_Budget
-	 */
-	public $story_budget;
-
-	/**
-	 * @var EF_Editorial_Comments
-	 */
-	public $editorial_comments;
-
-	/**
-	 * @var EF_Editorial_Medata
-	 */
-	public $editorial_metadata;
-
-	/**
-	 * @var EF_User_Groups
-	 */
-	public $user_groups;
-
 	/**
 	 * Main EditFlow Instance
 	 *