diff --git a/src/demand_requirement.jl b/src/demand_requirement.jl
new file mode 100644
index 0000000..a111187
--- /dev/null
+++ b/src/demand_requirement.jl
@@ -0,0 +1,9 @@
+struct DemandRequirement{T <: PSY.StaticInjection}
+    name::String
+    available::Bool
+    power_systems_type::Type{T}
+    region::Union{PSY.ACBus, PSY.AggregationTopology}
+    supplemental_attributes_container::IS.SupplementalAttributesContainer
+    time_series_container::IS.TimeSeriesContainer
+    internal::InfrastructureSystemsInternal
+end
diff --git a/src/demand.jl b/src/demand_side.jl
similarity index 79%
rename from src/demand.jl
rename to src/demand_side.jl
index 244ea99..faaa358 100644
--- a/src/demand.jl
+++ b/src/demand_side.jl
@@ -1,4 +1,4 @@
-struct DemandTechnology{T <: PSY.StaticInjection} <: Technology
+struct DemandSideTechnology{T <: PSY.StaticInjection} <: Technology
     name::String
     available::Bool
     power_systems_type::Type{T}
diff --git a/src/storage.jl b/src/storage.jl
index 459b6d5..da92a9d 100644
--- a/src/storage.jl
+++ b/src/storage.jl
@@ -7,7 +7,6 @@ struct StorageTechnology{T <: PSY.Storage} <: Technology
     prime_mover::PSY.Primer_mover
     capital_cost::Float64
     operational_cost::PSY.OperationalCost
-    ext::Dict{String, Any}
     supplemental_attributes_container::IS.SupplementalAttributesContainer
     time_series_container::IS.TimeSeriesContainer
     internal::InfrastructureSystemsInternal