diff --git a/variable_generators/generators.py b/variable_generators/generators.py
index a072832..d5d123a 100644
--- a/variable_generators/generators.py
+++ b/variable_generators/generators.py
@@ -35,6 +35,10 @@ def func():
             values = groupby.std().fillna(0)
         if agg_function == 'sum':
             values = groupby.sum().fillna(0)
+        if agg_function == 'max':
+            values = groupby.max().fillna(0)
+        if agg_function == 'min':
+            values = groupby.min().fillna(0)
 
         locations_index = orca.get_table(geog).index
         series = pd.Series(data=values, index=locations_index)