diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-package.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-package.php
index 1b168b8..d94b2fd 100644
--- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-package.php
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-package.php
@@ -10,7 +10,6 @@ class Wiaas_Admin_Package {
 
 		require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-linked-packages.php';
 		require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-package-types.php';
-		require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-package-delivery-options.php';
 
 		add_action( 'manage_product_posts_columns', array( __CLASS__, 'manage_list_table_products_columns' ), 999, 2 );
 		add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ), 999);
diff --git a/backend/app/plugins/wiaas/includes/admin/package/class-wiaas-admin-package-delivery-options.php b/backend/app/plugins/wiaas/includes/admin/package/class-wiaas-admin-package-delivery-options.php
deleted file mode 100644
index 4c8ff5b..0000000
--- a/backend/app/plugins/wiaas/includes/admin/package/class-wiaas-admin-package-delivery-options.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
-/**
- * Class Wiaas_Admin_Package_Delivery_Options
- */
-class Wiaas_Admin_Package_Delivery_Options {
-
-	public static function init() {
-
-		add_action( 'woocommerce_product_options_general_product_data', array( __CLASS__, 'package_delivery_data' ) );
-
-		add_action( 'woocommerce_process_product_meta', array( __CLASS__, 'process_meta_box' ));
-	}
-
-	/**
-	 * Renders wiaas package delivery options
-	 */
-	public static function package_delivery_data() {
-
-		global $post;
-
-		$additional_days = Wiaas_Package::get_earliest_installation_additional_days( $post->ID );
-
-		include 'views/html-package-delivery-options.php';
-	}
-
-	/**
-	 * Saves posted wiaas package type data
-	 * @param $package_id
-	 */
-	public static function process_meta_box($package_id) {
-
-		if (isset($_POST['wiaas_additional_days'])){
-			Wiaas_Package::save_earliest_installation_additional_days($package_id, $_POST['wiaas_additional_days']);
-		}
-	}
-}
-
-Wiaas_Admin_Package_Delivery_Options::init();
\ No newline at end of file
diff --git a/backend/app/plugins/wiaas/includes/admin/package/views/html-package-delivery-options.php b/backend/app/plugins/wiaas/includes/admin/package/views/html-package-delivery-options.php
deleted file mode 100644
index 1308d17..0000000
--- a/backend/app/plugins/wiaas/includes/admin/package/views/html-package-delivery-options.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Wiaas Package options related to delivery
- */
-
-if ( ! defined( 'ABSPATH' ) ) {
-	exit;
-}
-?>
-
-<div id="wiaas_package_type_editor" class="options_group show_if_bundle hidden">
-	<p class="form-field">
-		<label for="wiaas_additional_days"><?php esc_html_e( 'Number of additional days for the earliest installation date:', 'wiaas' ); ?></label>
-		<input type="number" id="wiaas_additional_days" name="wiaas_additional_days" min="0" value=<?php echo $additional_days ?> />
-	</p>
-</div>
diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-package.php b/backend/app/plugins/wiaas/includes/class-wiaas-package.php
index 41ccd43..e1527b0 100644
--- a/backend/app/plugins/wiaas/includes/class-wiaas-package.php
+++ b/backend/app/plugins/wiaas/includes/class-wiaas-package.php
@@ -49,20 +49,7 @@ class Wiaas_Package {
 	}
 
 	public static function get_earliest_installation_additional_days($package_id){
-		$additional_days = get_post_meta($package_id, '_wiaas_additional_days_prior_installation', true);
-		if ($additional_days === ''){
-			//Value was not set before, default to 5
-			add_post_meta($package_id, '_wiaas_additional_days_prior_installation', 5, true);
-			return 5;
-		}
-		return $additional_days;
-	}
-
-	public static function save_earliest_installation_additional_days($package_id, $additional_days){
-		if (intval($additional_days) < 0){
-			return false;
-		}
-		return update_post_meta($package_id, '_wiaas_additional_days_prior_installation', intval($additional_days));
+		return  get_post_meta($package_id, 'additional_days_prior_earliest_installation', true);
 	}
 
 	/**
diff --git a/backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-bundle-properties.json b/backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-bundle-properties.json
index 6eaf16d..d5de4dc 100644
--- a/backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-bundle-properties.json
+++ b/backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-bundle-properties.json
@@ -46,6 +46,27 @@
                 "load_terms": 1,
                 "return_format": "id",
                 "multiple": 0
+            },
+            {
+                "key": "field_5bdb1512ab14f",
+                "label": "Additional days prior earliest installation",
+                "name": "additional_days_prior_earliest_installation",
+                "type": "number",
+                "instructions": "",
+                "required": 0,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "default_value": 5,
+                "placeholder": "",
+                "prepend": "",
+                "append": "",
+                "min": 0,
+                "max": "",
+                "step": ""
             }
         ],
         "location": [