From 753f3bcf457d668f7c589ea34836afd7f28f922c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 Apr 2023 09:01:12 -0700
Subject: [PATCH] Added calc and modify functions

---
 .gitignore                                    |   5 +-
 .idea/libraries/bld.xml                       |   4 +-
 .idea/misc.xml                                |   3 +
 .vscode/settings.json                         |   2 +-
 README.md                                     |  71 ++---
 examples/.idea/libraries/bld.xml              |   4 +-
 examples/.idea/misc.xml                       |   4 +
 examples/.vscode/settings.json                |   2 +-
 examples/lib/bld/bld-wrapper.jar              | Bin 24362 -> 24362 bytes
 examples/lib/bld/bld-wrapper.properties       |   4 +-
 .../com/example/PropertyFileExampleBuild.java |  28 +-
 lib/bld/bld-wrapper.jar                       | Bin 24362 -> 24362 bytes
 lib/bld/bld-wrapper.properties                |   2 +-
 .../propertyfile/PropertyFileBuild.java       |   2 +
 .../rife/bld/extension/propertyfile/Calc.java |  50 ++++
 .../bld/extension/propertyfile/Entry.java     | 248 +++++++++++-------
 .../propertyfile/PropertyFileOperation.java   |  20 +-
 .../propertyfile/PropertyFileUtils.java       | 108 ++------
 .../propertyfile/PropertyFileUtilsTest.java   | 168 ++++++------
 19 files changed, 382 insertions(+), 343 deletions(-)
 create mode 100644 src/main/java/rife/bld/extension/propertyfile/Calc.java

diff --git a/.gitignore b/.gitignore
index a63b224..ed7f03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,7 @@ atlassian-ide-plugin.xml
 .idea/sonarlint/
 
 # Editor-based Rest Client
-.idea/httpRequests
\ No newline at end of file
+.idea/httpRequests
+
+# Local Properties
+local.properties
\ No newline at end of file
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index f713fc9..0f59db6 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,11 +2,11 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4747f6b..a9eecbd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,9 @@
     <pattern value="rife.bld.extension.propertyFile.Entry" method="key" />
     <pattern value="rife.bld.extension.propertyFile.Entry" method="operation" />
     <pattern value="rife.bld.extension.propertyFile.Entry" method="unit" />
+    <pattern value="rife.bld.extension.propertyfile.Entry" method="delete" />
+    <pattern value="rife.bld.extension.propertyfile.Entry" />
+    <pattern value="rife.bld.extension.propertyfile.Entry" method="setDelete" />
   </component>
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bce4c6c..2aea7f2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.14.jar",
+        "${HOME}/.rife2/dist/rife2-1.5.16.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"
diff --git a/README.md b/README.md
index 44d334e..277bf16 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # [Bld](https://github.com/rife2/rife2/wiki/What-Is-Bld) Extension to Create or Modify Properties Files
 
 [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause)
+[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 [![GitHub CI](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml)
 
 An extension for creating or modifying [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) with [bld](https://github.com/rife2/rife2/wiki/What-Is-Bld). It is inspired by the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html).
@@ -10,13 +11,12 @@ An extension for creating or modifying [property files](https://docs.oracle.com/
 public void updateMajor() throws Exception {
     new PropertyFileOperation(this)
             .file("version.properties")
-            .entry(new Entry("version.major").defaultValue(0).type(Types.INT).operation(Operations.ADD))
-            .entry(new Entry("version.minor").value(0))
-            .entry(new Entry("version.patch").value(0))
-            .entry(new Entry("build.date").value("now").pattern("yyyy-MM-dd").type(Types.DATE))
+            .entry(new Entry("version.major", Types.INT).defaultValue(0).calc(ADD))
+            .entry(new Entry("version.minor").set(0))
+            .entry(new Entry("version.patch").set(0))
+            .entry(new Entry("build.date", Types.DATE).set("now").pattern("yyyy-MM-dd"))
             .execute();
 }
-
 ```
 Invoking the `updateMajor` command, will create the `version.propertees`file:
 
@@ -52,42 +52,41 @@ version.patch=0
 
 The `PropertyFileOperation` class is used to configure the [properties file](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) location, etc.
 
-| Attribute       | Description                                                      | Required |
-|:----------------|:-----------------------------------------------------------------|:---------|
-| `file`          | The location of the properties files to modify.                  | Yes      |
-| `comment`       | Comment to be inserted at the top of the properties file.        | No       |       
-| `failOnWarning` | If set to `true`, will cause executiion to fail on any warnings. | No       |        
+| Function          | Description                                                     | Required |
+|:------------------|:----------------------------------------------------------------|:---------|
+| `file()`          | The location of the properties files to modify.                 | Yes      |
+| `comment()`       | Comment to be inserted at the top of the properties file.       | No       |       
+| `failOnWarning()` | If set to `true`, will cause execution to fail on any warnings. | No       |
 
 ## Entry
 
 The `Entry` class is used to specify modifications to be made to the [properties file](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html).
 
-| Attribute      | Description                                                                                                                                                                                                                                                                                 |
-|:---------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `key`          | The name of the property name/value pair.                                                                                                                                                                                                                                                   |                                                                                                                                                                                                                                                   
-| `value`        | The value of the property.                                                                                                                                                                                                                                                                  |                                                                                                                                                                                                                                                                  
-| `defaultVlaue` | The initial value to set for the property if not already defined. For `Type.DATE`, the `now` keyword can be used.                                                                                                                                                                           |                                                                                                                                                                           
-| `type`         | Tread the value as `Types.INT`, `Types.DATE`, or `Types.STRING`. If none specified, `Types.STRING` is assumed.                                                                                                                                                                              |                                                                                                                                                                              
-| `operation`    | See [operations](#operations).                                                                                                                                                                                                                                                              |                                                                                                                                                                                                                                                              
-| `pattern`      | For `Types.INT` and `Types.DATE` only. If present, will parse the value as [DecimalFormat](https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html) or [SimpleDateFormat](https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html) patterns, respectively. |
-|  `unit`        | The unit value to be applied to `Operations.ADD` and `Operations.SUBTRACT` for `Types.DATE`. See [Units](#units).                                                                                                                                                                           |                                                                                                                                                                          
+| Function         | Description                                                                                                                                                                                                                                                                                 |
+|:-----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `key()`          | The name of the property name/value pair.                                                                                                                                                                                                                                                   |                                                                                                                                                                                                                                                   
+| `set()`          | The value to set the property to, regardless of its previous value.                                                                                                                                                                                                                         |                                                                                                                                                                                                                                                                  
+| `defaultValue()` | The initial value to set for the property to, if not already defined.                                                                                                                                                                                                                       |                                                                                                                                                                           
+| `type()`         | The value datatype, either `Types.INT`, `Types.DATE`, or `Types.STRING`. If none specified, `Types.STRING` is assumed.                                                                                                                                                                      |                                                                                                                                                                              
+| `pattern()`      | For `Types.INT` and `Types.DATE` only. If present, will parse the value as [DecimalFormat](https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html) or [SimpleDateFormat](https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html) patterns, respectively. |
+| `unit()`         | The unit value to be used with `Types.DATE` calculations. See [Units](#units).                                                                                                                                                                                                              |                                                                                                                                                                          
 
-`key` is required. `value` or `defaultValue` are required unless the `operation` is `Operations.DELETE`.
+- For convenience the `key` (and optional `type`) is first set in the constructor.
+- `key` is required. `value` or `defaultValue` are required except when deleting.
+-  For `Type.DATE`, the `now` keyword can be used as the property value.
 
-## Operations
+## Functions
 
-The following operations are available:
-
-| Operation              | Description                                                               |
-|:-----------------------|:--------------------------------------------------------------------------|
-| `Operations.ADD`       | Adds a value to an entry.                                                 |
-| `Operations.DELETE`    | Deletes an entry.                                                         |
-| `Operations.SET`       | Sets the entry value. This is the default operation.                      |
-|  `Operations.SUBTRACT` | Subtracts a value from the entry. For `Types.INT` and `Types.DATE` only.  |
+The following function are available:
 
+| Function   | Example                                                                                                 | Description                                |
+|:-----------|:--------------------------------------------------------------------------------------------------------|:-------------------------------------------|
+| `calc()`   | `calc(ADD)`<br/>`calc(v -> v + 1)`<br/>`calc(SUB)`<br/>`calc(v -> v - 1)`                               | Perform a calculation with an entry value. |
+| `modify()` | `modify("-foo", String::concat)`<br/>`modify("-foo", (v, s) -> v + s)`<br/>`modify((v, s) -> v.trim())` | Modify an entry value.                     |
+| `delete()` | `delete()`                                                                                              | Delete an entry.                           |
 ## Units
 
-The following units are available for `Types.DATE` with `Operations.ADD` and `Operations.SUBTRACT`:
+The following units are available for `Types.DATE`:
 
 * `Units.MILLISECOND`
 * `Units.SECOND`
@@ -98,18 +97,6 @@ The following units are available for `Types.DATE` with `Operations.ADD` and `Op
 * `Units.MONTH`
 * `Units.YEAR`
 
-## Rules
-
-The rules used when setting a property value are:
-
-* If only `value` is specified, the property is set to it regardless of its previous value.
-* If only `defaultValue` is specified and the property previously existed, it is unchanged.
-* If only `defaultValue` is specified and the property did not exist, the property is set to `defaultValue`.
-* If `value` and `defaultValue` are both specified and the property previously existed, the property is set to `value`.
-* If `value` and `defaultValue` are both specified and the property did not exist, the property is set to `defaultValue`.
-
-Operations occur after the rules are evaluated.
-
 ## Differences with the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html)
 
 * The comments and layout of the original property file will not be preserved.
diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml
index a0a25eb..0d30585 100644
--- a/examples/.idea/libraries/bld.xml
+++ b/examples/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16.jar!/" />
       <root url="file://$PROJECT_DIR$/lib/bld" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.14-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.16-sources.jar!/" />
       <root url="file://$PROJECT_DIR$/lib/bld" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml
index 4af0048..7010ea3 100644
--- a/examples/.idea/misc.xml
+++ b/examples/.idea/misc.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="rife.bld.BuildCommand" />
+    </list>
     <pattern value="com.example.PropertyFileExampleBuild" />
     <pattern value="com.example.PropertyFileExampleBuild" method="updateMajor" />
     <pattern value="com.example.PropertyFileExampleBuild" method="updateMinor" />
     <pattern value="com.example.PropertyFileExampleBuild" method="updatePatch" />
+    <pattern value="com.example.PropertyFileExampleBuild" method="deleteVersion" />
   </component>
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />
diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json
index bce4c6c..2aea7f2 100644
--- a/examples/.vscode/settings.json
+++ b/examples/.vscode/settings.json
@@ -7,7 +7,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.14.jar",
+        "${HOME}/.rife2/dist/rife2-1.5.16.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/test/*.jar"
diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar
index b372bbca395b12e4b934742e6e1e4c43c56ac962..ca16d0f549434c67f8c4778feb6841d208417881 100644
GIT binary patch
delta 11581
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

delta 11581
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

diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index b61179e..3689138 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Apr 02 10:32:44 PDT 2023
 bld.extension=com.uwyn.rife2:bld-property-file:0.9.0
-bld.repositories=MAVEN_LOCAL,https\://repo1.maven.org/maven2/
+bld.repositories=MAVEN_LOCAL,RIFE2,https\://repo1.maven.org/maven2/
 bld.downloadExtensionSources=true
 rife2.downloadLocation=
-rife2.version=1.5.14
\ No newline at end of file
+rife2.version=1.5.16
\ No newline at end of file
diff --git a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java
index 966a217..12d44ed 100644
--- a/examples/src/bld/java/com/example/PropertyFileExampleBuild.java
+++ b/examples/src/bld/java/com/example/PropertyFileExampleBuild.java
@@ -3,7 +3,6 @@ package com.example;
 import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.extension.propertyfile.Entry;
-import rife.bld.extension.propertyfile.Entry.Operations;
 import rife.bld.extension.propertyfile.Entry.Types;
 import rife.bld.extension.propertyfile.PropertyFileOperation;
 
@@ -12,9 +11,10 @@ import java.util.List;
 import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
 import static rife.bld.dependencies.Repository.SONATYPE_SNAPSHOTS;
 import static rife.bld.dependencies.Scope.test;
+import static rife.bld.extension.propertyfile.Calc.ADD;
 
 public class PropertyFileExampleBuild extends Project {
-    final Entry buildDateEntry = new Entry("build.date").value("now").pattern("yyyy-MM-dd").type(Types.DATE);
+    final Entry buildDateEntry = new Entry("build.date").set("now").pattern("yyyy-MM-dd").type(Types.DATE);
 
     public PropertyFileExampleBuild() {
         pkg = "com.example";
@@ -27,7 +27,6 @@ public class PropertyFileExampleBuild extends Project {
         scope(test)
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)));
-
     }
 
     public static void main(String[] args) {
@@ -39,11 +38,11 @@ public class PropertyFileExampleBuild extends Project {
         new PropertyFileOperation(this)
                 .file("version.properties")
                 // set the major version to 1 if it doesn't exist, increase by 1
-                .entry(new Entry("version.major").defaultValue(0).type(Types.INT).operation(Operations.ADD))
+                .entry(new Entry("version.major").defaultValue(0).type(Types.INT).calc(ADD))
                 // set the minor version to 0
-                .entry(new Entry("version.minor").value(0))
+                .entry(new Entry("version.minor").set(0))
                 // set the patch version to 0
-                .entry(new Entry("version.patch").value(0))
+                .entry(new Entry("version.patch").set(0))
                 // set the build date to the current date
                 .entry(buildDateEntry)
                 .execute();
@@ -56,9 +55,9 @@ public class PropertyFileExampleBuild extends Project {
                 // set the major version to 1 if it doesn't exist
                 .entry(new Entry("version.major").defaultValue(1))
                 // set the minor version to 0 if it doesn't exist, increase by 1
-                .entry(new Entry("version.minor").defaultValue(-1).type(Types.INT).operation(Operations.ADD))
+                .entry(new Entry("version.minor").defaultValue(-1).type(Types.INT).calc(ADD))
                 // set the patch version to 0
-                .entry(new Entry("version.patch").value(0))
+                .entry(new Entry("version.patch").set(0))
                 // set the build date to the current date
                 .entry(buildDateEntry)
                 .execute();
@@ -73,9 +72,20 @@ public class PropertyFileExampleBuild extends Project {
                 // set the minor version to 0 if it doesn't exist
                 .entry(new Entry("version.minor").defaultValue(0))
                 // set the patch version to 10 if it doesn't exist, increase by 10
-                .entry(new Entry("version.patch").value(10).defaultValue(0).type(Types.INT).operation(Operations.ADD))
+                .entry(new Entry("version.patch").defaultValue(0).type(Types.INT).calc(v -> v + 10))
                 // set the build date to the current date
                 .entry(buildDateEntry)
                 .execute();
     }
+
+    @BuildCommand(summary = "Delete version properties")
+    public void deleteVersion() throws Exception {
+        new PropertyFileOperation(this)
+                .file("version.properties")
+                .entry(new Entry("version.major").delete())
+                .entry(new Entry("version.minor").delete())
+                .entry(new Entry("version.patch").delete())
+                .entry(buildDateEntry.delete())
+                .execute();
+    }
 }
\ No newline at end of file
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index d80796e4e6c406e63e91b88641c8ff145ba9c7a1..dece4d439962d4dacc2cc34ad1d6a532757c901c 100644
GIT binary patch
delta 11581
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

delta 11581
zcmV-DEyB{Oz5%Mf0S!<~0|XQR2nYxO=%|8`4SoaYsDhD>Fn@e`d{pK2_c_m<<W44+
z00{wtqCp~rtb&4?fXJ$WBwzx>;1Y*q0t1toI5S~!sdcT2RNJamYwK2}ZmkOp0aWa!
zcC%WoTkBGPYB%@R)&=DKp6A|~xsyzU{_*O^x%b)5bDp!G^W6CBFLymgM6*0&Oj1l^
zqrvV#?W#~$?SF=-zqdCKt!=ZPKJrkGNx2r8<YgMM*1z6g8}f%&*DhJLHqaSo%AFYu
z2jeF&8Rb(}nB-%!^rT><c406S@RG&k?TZDXHC;h~E1=;fjj(7W6=r~I-4u%ldYJN8
z2jWYk5o{gb#5AeA(KRI=4Te|OPZ`|hqdXcVC>ApnXMbC=B9EBHSTvSOutjHIG#UuU
z=Le%5Oa+Z@bn8tzglUxS>Wc?MwGJ-9K+H$uC`aHNX3^nP%2epkDm?|@MmJ_#TQBR5
zuxO&}KYGwQ*}21{BY|Ujbz?BRF3@$dKenbd5cg4;y?MDsQ>cPzSTxWZi3Q`4sJ-uS
z*S?sqH-D_Ms9NUc2R6n7;aD&dj&(?Xtwl%CRHl-y$cAtz;_q6J9B+;EMLRV-UMVw=
zw&<AbGZ$gEu1KebH^ZW1={P2HRbO{^K!~bNo9n{>B&VLKD2>^iXw<){F&M*nX3+^I
z&9>-7nv)cS^pqIn${&-7Oh=ZV);Lh?l0x7RDt{J-2-ML$5rO%@w%j#3FA@r21yF_<
z2vQ3zI*Crkp22V|?hl3Lgu5F3ec{eEz_ffI*eMMnvWqNQOpQ#Qz{Vgj@{~8&pqedO
zLQBE5&S=0N53~*BE7QdCO!3Mln*yoDqE=c4q%t5a@<*9Q4gfJ_g_l+^<%NQ)qJH7N
zNq?tis*(omrIo^wP*=^yo=`rWPG^{OrbQie79>|s4g+F0Al5GR$8mTS>1L|WqCKY#
zse>61>SdEv7Ijh=G(H}&r$U*^htSw=Vb@Z5TVqj>)`I7tZ!8|uwq&J`LeyhY*rEva
z0*p3M@kk^T({xx49$}^r^y*4(b;LkY4S(KP<TYwhjKIf{Ee#77OzT)Qr=?@*oMp=v
zv@}C@ToMostPX6Hv&93^Fi>7k8%)}0(Iz@4LsK*6f#^N{c;}h`Sa-CWn)BB9qpg9n
z`vT$4K!*I<%bV;)^@T9Y=UH^V*vBzF{&j(Qk#MI!-WH6n!5btt9ET~ofWB_hg?|=Z
zq^Au5OH-#e<nIj335Dd~msoVE9K6Inc<YkoE%O$%x(QH-S?3AmFSqClx)QcyLo^r<
zBndn*i+Bu_PLr-;s&;WJu(31HD+=gh+=6H{5?zoSFzK5~GXXdaOHu<q+CtZen0yO9
z%DwlpHPOfh|0+ivz5{z03&i6<Cx2G6HWmqc={ne12!FL>YioK_N-2c+u0=NpA;vCk
zS+aCN%d+;46$@Hg8<sSu>7eL5FMW^cPEnzu%-^hTe<&94Wu4;K(pm9npFJaOg=guu
z+k($3J2%zbbiPlhH!TISF#-X=x>-*D`ao2`V2$&3zRyeF2MscSc<C0V!++Pr<Gr!E
z+FBWyTGQiS9|+e(qN{85+q7CAwb5-B-A;EvZXID^nm?r69zdSma^a;rA%HF%q3ByJ
z`Vrj?Zv`(uXH_f`>Wc?NCSbpkRw5}#GW}kQ?xXu*7vd4yMvX2X((?Soq6cJdo&*qn
z@$V)*1n-eK9Xc8fuEMT*lYcqMmXEg4c9Rko?V$doD5e(4RG6BPwrxh(0Dq#n2D@FJ
z4WH8*4{F!!W>j$5WzlYW1i?vHAQXrP8oC!ahH*^R{idum=`m0zZ3ou+qp$*Dh>Q5z
zM=3{sernOr=;t^HNYvyHhEs?D@S){ylO)U2qcEDkq$f;z(xRv6SAR_7hniT{?C%j?
zHqB{<foWZq)GEl~kihjC2+MC^^{3Vx<)h!x(<c4iqG#w?DCkhjFuS)88hl*&;NW1$
zaKYUrXL`<}=jA}Yra2AG9rGIJw6;pX`+`L;(o1k+pwqmNKNge7zzsrof>E!~pG^9*
zMX!p>8$Mth3WfD@I)9U1A4D{`_9cCB90A%A@WapjC3#p!0o<cr`ai&Tn=^p$(Hr!(
z*v4f(dX4@nZ+~N&ns$M12=$HGWy1+S{$bHS>0MY5e^-}Aepy7v9!HlqekI!VgNP#b
z|9v=$p%Mx`s}V*m5H;yT1k)}@(GU(h6H*SqOCKYl5O<Z7C4WKp-xhsB|G@yz6<Rsi
z9`iq7>x#Z!qfagROwya2?oeNBjr4qB(O%ut8H&Wfz%P?VA=CT#Xdkd(7XKu)Ywhdp
zjRs<|Ko<-v8!)Ww5vw(CUKRscNCur(2zi6UeTBUi=dsUDfLa1E?L5*EO}5}G5U*X{
z(g-j)0$~e{@_%sw4>x&)#Ur^enTI*kU`yZt!w4b5b~Ma1t~?V`daT~Zqqx}Q(H4*4
zu}Q-+Xd1SF*Igb9%=07Mh)H0)5(LHCaTXuKhhk40rXieSfY`6JnRgA;n|#<H`vvYT
z2*;zFd^{d!qt|$X#YgZ&?22{G@TPi{=@2*D&k6R{u73>n>LC$EMpAW1a>uzkKM8cX
zcJ^@@PloPrc{;)vfSVktj4Ldz<SLv|0!|1<`Dt?{Ie3k0EUx9F(4!+IXgx+6bb|02
zPqX-F5hI@#Bj+?_^o5US&=)2j>yCQTJ9_zeh*NEb)PuG47S9x-`h<~5>}T)^7SHAr
zK@~v^fq&lIO>vtSQ%;+k$8&j}$@48<zzdlsq<lvwoHuv}k@APT{L!v?b{p$*mM>e_
zfn;u6<DkjTq<WF<lZ9ptFzh((&@-p3$mhk}XmXRq%@W}kWad|(Rxq}pr#HSy<}J1O
z6mEgLj|O@o>jRR@H)OHghzxj{#mgm-7$GLwAAgR7gPs16m;#gAfO~pPOJ6u1><OeJ
zN?t+N2!xdqFF;M1Pq+9CG2lMHT44t((%oV4S-PMg^^HNPoy=Heai<_r<YbcbaU$)W
z90&o6yBSflFQoHJak=0@){M}dahe>=ur{t}IFHv^9May#6+uZ1;AOzhS=AQ|b$J=-
zl79i)i?E2J7RLlfgiyL1!+jWwMLWH`0Wu<+co{mB7j;Zd%**Fu29irJpO2)lrpC(`
zfX)L0R;h+O?d6N465$R?y?hDN>;pudospi}z73ngwR)-Zn~oG~1^93;e*-2Vdn7E>
zy~5%vc{3;hT<3<ml404VuQZyeG7oP_rhmasS4%*Al8>*Vx3N86WAV56+aQr_o30FC
zvOUpuoP4dt*9j69kVs)5>%VL94Sb^%n<C*j7#~|4*fgLxm5fbRdKq~JSBYAE-{K!I
z;`W?aZ%9fFld~NqOF}MdZ?pJz5e*NzdZgor7T+mK2OXP>$?NiYEC0ykyDh#)P=6bi
zQ85D3;lKp-`z*ene~j=aAofZRjm(G+rM@Jv9<ca9MvU!+-HZBha#w(^CpI|!n7xg+
zo1CzChaglqcnYvw<By3|m$^GF-o?9dlrTC5mJl4enfz!*ZK=uMTc#~+K0m^HEPh-7
z<U&nAd5P*E(1?A9Wn^MPrC(b71b;sXErkw8<1tCJho~a16v)4__}2nig2NU5P#;w4
zw+NrVDh2fN(-K?gR1x%j#-fq@?10cUBbh!>xs#vc=S}{j#V-irBhwS+B9039#WDAa
z0d|^RerYHSojg`V`4x-*B;qp;2XoBb{48qss>QDf_61J1=vYjX-$)iBTz{y}6?-IF
z^*W96GJ;r^jFaEC_#MF<64s>&jtTrXi~r95kis9f4g-<ugDU<yThz-QVDWoSrD$4p
z+MY<X?Bx$YgMlN}j?uGcd<43kUUs@GV{PMqS#%LUn}>scV)1{Zd^>V}L+i4ZhPlg^
z!7sOV%x`GPqXPca;?MYVD1T8P3Rx~rS&OB>F&Rh{QZ6Dj-p5~>yx&qJ-lZtZMCd}V
zv_e8~r7UF#Uq+_+;?Ufya+oR>`eD7gO5>5zXaE!mtPhkrF?XqRkkW8p&nhGh0?o9P
zS87JK)fU4i8H$YfER`>e%})x+@@Po<hgqsXikzd8{R7;b8eu72&40J)?#O%^@_V{)
ztwvd@Sd9jSJ0-vm=?tI)`FZ0(WD4T))mTfFsBuuFcw~7?gR5d-$E6MRK6R)XZ>qyA
zb+{_c41XJ(WsQTDH3If~>Ij%bH8EXlO^(UML4i8bQj;`qBYp8gq*=m4HN{dD!oVEO
zD)i8&2+|O!sv1>ms(+&_HC0VZh9XXEguoeT&OGM@CMO)&;Ix=d7$W*?91KBRkfa|H
z>N)Fij5pLVmYS|+*pW;M?u7DeAcQ~3rKUPA8JTItYK(+e=UlMg{>P_gs#&Hw!BVr;
ziODo}C{Un!Jn9d}5M?inMj*&l<p+uWqD4~{dDUE){H{niAb+{-7eeI)q9$Hbos`_!
z@z%|e_`*nExGS9~D)2Zj9Eq29OMfAG)ncil_Igzlm=utDV<Dtyu~$Ksr-;zih($~$
z)Q-@l45OrAq4jbB_MU37RI6GhC3i@pliMG80OMq5!=_r1ahsIBjL75X)Tx$gS1WPk
zW$jBBK=`s%7=P61mO4Y7X{S=U037Y>)c*45jC&C$`*!t21KqM$t!q)eSDgh7=<DtB
z#{;RO#$=mSmg-bpcKNI+5ML9)`-um*3>bP(8v+cTPf}A>s}ZZw-SAr~XsNYo9W2~>
z@tsS$C1hCX2I2TDXmgJWn<`?dUUhbo`$HWJRtu`spnuEbk~UBNiaVo>R6@m6+*Ey*
zTCX-F3ouzu0<RPduaB$)=;O15a0j=UsSp8H4&I^xkZu3E%pV2$)A7FAsLr+2dFp(p
z7Ul1Y1zb7wfJ!)0D0P9QzAh=0f$3g_=-jNX)=2?;nYzSMmrCH58#ucU!H6*C8<x6U
zQj}ro6n|x2C@3RWT57Y53{Q{DwE@*hHL;F=B(tuz)HUi`knv!+Gt}1=ShT)psXq$4
zkFd^l{gqB{2BkYIyy`o^x4ILWdL4A3T9>x!)ORg)gA!yBl_IPCid(&vrutq6?~tXz
z1I3cThq_69AK9w<LDmbt6*7LSrEXKVL;AbYS${;uS6n7#?oclverTyX)m;D)46g}9
zgYkwXuA=Hti+*IOyVX4s?n~?`VP}>Fn0cSN-&8-g)KAm{8S$Po18m;l55giw_0?H}
zaONRPJuIb%kx|={xz(N3c1tBBEgY$Z!<|0)D5Ux=wNq{*huh_6*I1s~ZK+4}U0u&Q
z5PwSpd(2XM)Z=!NsBJ<o64FI}5rD#sd_YrNGJP#OKeyB`1c$LmM}a}I=oQOA<q1nY
zsh)zBK+d=-7!E9pxU*g@Vy6w_>EO%ZkovWyexnen=dFzd!_L~W!Qzl5+E!1i-<#?g
zOFgUp;K<oVr((Gbzu>|8V3*vs6+`Ll?|&F1tezL?>4n@x(_)ZZ<sPliSI?_In(75h
zy{KLq06r7UXaVokYeXWO{9*rU8Hkl<fS(`quMS6I@nEMMDG<gc?qkB%q{<FiYc?6c
zk{b#tu1)KOfv;HVPr~;C@ZApk^i4^=dR4t<s@E;`hWZN_bP(W}4#DA)owmJ<Nq+?4
zT)kAdjjm1^R}Ij}RHvzsW*nZK9*)(Bz$Uy&IbQV+ldA3#yZJYZI@I5pRvy%K!vApP
z;F5bV`k$71SG{N73@r1<;0L#-txTKL4;@~)CBRMggJX0iMGm%aXdx}LUmPD5TZglJ
zpguI!N0$0n{fnvmU>Cx^L;6Ak4S!wA=OaM)#8Uqe`(mxKJ9Ul?eyL9_^_iA7&@O%Q
zn3$6XOtsf39}lLD4-x#Amf9~l)UXgtNNWJevD6$2Dc@iOiTo@?mcH;B9&B4Zzr3b$
z_LN!WH5F6fG>u%#FeO)YZuPO>HY3mCQ^=b~AtT>1EV)P?A$RBt8yXiRFMp7IwB9JN
zjN!%zEbX+(@s%lU)-Mi1MxkXC8KdlL0TBedYT7b%5it|QkOSGwvN75+#u#H^+ha~1
zdPs)(wtH(+*{o%Zvy4NGL*c&=Jcl-=&o{tl>ebx{BSa2r7dkKX`Nm<!;ige)854{n
zGCpI-*a<$Z$KRW-mka@IXn#y)pEAohQluw09<jeaVq>ypl<V@X?SDjWQ?5sNTVWZM
z`ZJM5b5_jBU~VA|Gsbz18h8`^W!suaPrz#&1?V+82Zo<CrXl1oj?P}e%XSZi9NCy|
z88f8BP+)(bvAlIbi_{mq#&MDt0d22Q=Ukaht3K__BWfp{QCU8F=6?joaZWj1*D;Kl
zNINs;B+DGm_zCdKH5Gcs>B+injeJwqG-t(v=8ky_nwPcAL8@Fh7*9+}eubhHQ_3Mr
z+L{}e%$eWOxMbd(W%{<)!Cy$$Jf{h%&FIVzPSOJfZ7p+_F2ymIwk%lKaH`ipqL=Tw
z=mZk!8TwO=h6Sydl7H-k+CljSe#L?Fr@FGBSDYGbS+I0TYs0c7EgEV`s(-<$%N8`-
z--BqpAS8pwTD`_n+xfXZ?SQ`<ymcC!LxBU#5`mk)WFEw;HMlzLkM~7E=!uyX*qMWw
za{}1onHT8_$mf7Cbj`Z#vrLS;FjE}=3V$>xZKu-{UlWYUU4PF|MHqqDqwg(7muLG9
zOg=<I($d!x2+QSBQI<K_I^&}@$EA<z3cxytwQF$I?oCG?nS7}{2(yd(dRIsNU4e$K
zfFHWrsK0&Nq)lrWq=%L=j#JzCKYey2hwIjMc^Kl7&UH=xUWYEp?N-D(LC#j^(;{SH
z&US)-`ir8DRe#U~T?T@wS}Qlv13z~dco7XqJ<bh0LcXEy=3!UY+0}-e&Pbm=WCJ1=
z;l}usoy~HmSuYoku3Or%LtXPqVZ^>e9f(8n?o~(>)*p3vqp3^jg3KbByWE+HMb0X@
zi!|liP}h_tZU$J+$G9CfBdji0aWS<j^BN4RMhx^`@_*rNhJ0`8P0D!LfVo2`&g6l)
zK-PIvzyMFL{uarX{?-agkg@=vRB!70<zg4i)cpiD%LRM7gUGJyvrTaCJY;-%LcM96
zfz3ir?EtUcPR&){pvL+_@zm#xS?cAY{Q7c5FSB_((oKDbBO@H&(UG23k}=Ia4$Iu_
zt_B`{fPcy(z;_S$)+KfGoaH+h%s2X?fLjzDTtWm353<&n!fU8vB1n6y`_r+nf~Idm
z>{?+*r>(7W=a;Tb9e#kC9ITIBkn8AiYE9#YuBbVBD7$6)XGba!f@N7eWQ7UyM-43K
z&8!f0IO40ZwkMe|75dWMxF2DOE2V&uj7Ix<<9~rPO_`>D_09Lt`Uae1nYxtvjvPn~
z@3o5{9jk1~&ZOUfqKm#-acU+-SxPNTQ?hL{gw61ErLv5q2_2k&)XSHH=`^ULFC5hV
zBU=h4w=e0`hH1hOFjI-F94L}>k|W&P#C5t=aqu}EjIZcoM^7>(Kk}do0dl1(#Dx>=
z>VN18M(rzBTNP|Wndf@<cBaZ1<A$z@NR<Zd4x91E4nc&Om045elzn76Itz^tylVD=
zh(7Z`5K6O)c2e-gbpJMa3!Z_TT*61;7Q8YvN1t9k1{vjom%39&+MT6)2uWRhP~PpJ
zG!h}72|joDSH(1+qT2Gu<g<%`N#&q(Lw}2rY;{OP*`Ya{0yHM%?^)I5FUu??l}%+j
z>cD?OkvRblDh({79$AJI%{#L*<ov~wFTE3lzb*A?<$6DKX>KGEhqd$f+LkvqJlA;L
zXS`wj#Wdcu=zQb<5Lu)#v2O<)gzPW&7y6x$_6Bzb=uEVMo(z?eQ#M8->-u`LoPTVn
zg%aLmnSOwK2nWPGe<;)%j0fty#@jGBcBaU7YWP?2t#(Jo-MI007~0IQ&)IAI6QaO1
zTD`r-dk9Ty(fI*XdtRh3)D@l_FYOM7yGoOhW9ej`>@_~hxU;rXgHm@yQJN~kmvW8Q
z_!m%0eu#iW)|GN;O-)Uy*Z2e*rGEh>Z>LK|8uh~eGF1*aUfR_cknV=sC8fbwtS^8C
zpCNGKnl=8|8n5vMPQwhQ@ADa78v9KTSswN%NckXoHfmu5WBlDomgo1lTfhDPF8~KW
zXm9z|YrjfpMtD2}{w{Cm8?WKHo?IWX$Fz)>jh9C7W_0+ZBi}M!G+u(zrGG#9)!!`Y
zucbZ1Grmn~lG;y>^R4Ib0ba}W6eR<-15wxX6lVk}*``7O?8!8NfDRFjr?JLt<3wU(
z4qA$SfcD&Un=eLto~!*X+VfrQ_h~GB>{|a3#uud9#zM4Dc8y<)c7v<^CfbW!@GeAq
zv8#O<+KsOE*U)ZqwSR_ovwv&9C1{`G8vhO2Ew1*9XwRS$ypNU7T{I43^|Mg^>QT2R
zI_)V`fpx7K?lQEiGulf2$WYHeMn4PXj|8PH-+|ycPW}i>KQDEjH|S>>C~uM%kd~u$
z1GvC=HdpK*qhdGZwHN01)36;>w4FwyJ+6HR9lD*ySMYY4fOZ+$lYh3;<n(K0g|VG#
z<Y!vNNDn>Y-A>aV)Htrd?<C5@Zz*;;nnuxdoN)#)IF@RGYaJa=v++BhW*TjnW!ab*
zryA{e<{2xE(;O^Ma<DAfO^jWS-%WMx75y}G2hB~;f_`d9Z|DO-h`@F_$py5;INdk{
zPd3h^rI;x|Tgbq_n14}GS(Tusipm6?l7>^D$66_umQg+}*RV?M`3{2e)&W+reme_H
zR)!z%g6bCRv?{q1TOfB1Mgl_L%EININ2#sdC~R--r_**4yx|TCG*>5R^^G*Yx}Vn7
zc^;y(OFRkctJ+295+&$s(sgmN>oTXS#Dm%2*h<6eJiBR2dw+>%2VK4AL2N&fmeZ-U
znGAiD3J?XG)1lOjku{L3AkCz;w1n1SUKle&w32$Li+c4jPr#w4P?gb%BY805GrEj`
z*49Ak=z-MH1NPAYy}{^4pJA*Pf|J@0z#fy>q&$<_@GGyI^D}6)CdG{pK_Q`0lTD*<
z8=%o(@=P6)Jby#d;xL*;C#Gm&%j0=8hR(;x1(3zBLmDr{oJ%n4BAQDVQzKoLqC*)(
z$EL$v7af{XbZAP^p~<1c7@9GV4ksRf4od#a)sdBp(3gvmi)}hwo8|1+C(nN4fU}?C
zK6~L!g*O-eAVIel{t)7QYn=yB?n=--JL$&=gCC^_`+w=-HuT-oPdnSv)XUKja%}1;
zSe2=;FPkA9F<PIZ;v$kiqr4J|u^De$plsiyO1c_zzm3_~K*zs@LthIuycyK|KAl3h
zK>lt8l-mL4PC&YYHqsA4@2#5BEl?0xK_jRsJtIZwjm}#RAWSvZ>QRs;Mg5CY)W6uF
zem-q<QGb6rdG-ULEY#nRu^e|de)Y)bl*yS^=)cXGRv;;yxoS5(3L~_q31ofzA^Jt(
zuM_m!HoNhMiUj>JK`%?sZhEbKH@(qrGxAL^atFOtwS(SiuBa~L1pOV4_v}Z=er&cM
zAJ~tN67(<d=fC*x^Q|;iGY~IUT~3LoBqu@pOMg6?MRO<ug6;#c&VxYjb68Xd3r2J=
zaK4X<>3*6_Kf%lg=wx~j()JLopoi%U+6JZH4l|Gdj2(dT6EL)2v!ntPm_v(<bw)^A
zy{l40zse!Hmo71Sj4-H^BK7(-sUJ1zHF@2)UyPr-7kzrb`&ov;RPrZMjxjhD9G6W;
zYk$-H@`#!dwFy?cI7bBjUjvQ(BRJrrE(1L}h3aUHKI^xLS~+09Pv}4Pe(E~(Ss3XT
z_Eqg-usOkIbM=!nQq%!G`9wR|+QY&H9tIZV7zr){8@L2Y$K%_pcJSeKxs@fk2`=5u
zWuk;Usm?4hE4I<}1W#$7;Z?WL$VzD%#ed!eS8v__c4dO6mY4}XW-FD{d7U?_F0aH}
zk|zxI?kVv+L1oZ)p1ze1t;^X;W9od;H_YkFsmm|%K@4)CAu$-keXwg6!Q=0v>*;%l
zrnbQ1e+$}1bPt&O5ZZS@|D<h;$y&q(L_dYF{0y4>b5QUJtau9c|5xzQzlJXU27j9T
zTWIpr*x?!S)3Xqj=djoF*zIY+egQkZguPzHZZAW}Uj_6Ru-i-6?^W#hGKB1P2-h2$
zL#IOl&j2@ijk6&ar_hN;)QBM-nL=xfxX}l`pGc<|>x~Us)%sJM>`!sB-`J=%y@2j9
zHW}xD;}hvRV~lYwd9)z@imbg<YJYOUegsHfEqJeqigSU<GfW<3@_3WWi1yNW-Vb{*
z^b}iq^F(g5&qzt~e&CZcU=~rMNn7S?7zLC+XcYfA>$h<B^=@I6KcR7y<3;p|8Js1;
zTExdeQWIR)2w9p1=h@a?^$^e5!6!9WK0zirr&mAFgx3+3T3+&+t6)a<SAXr%6g(Vs
z-$ykx4eFaT9OE?Q-@@qIR7CG!&R=0X-oebbQaV-y4xWbyPGHo6gXe0_%(A(qxiF19
zU(#eDmT^9gv>y|c91!QS$(m1w-A)oQCqp++f}yg_Zp=CES(Q6^5z|dHgY6i>*vU&2
zJx*;1RukOXw3UW6@8%Wl)qgwq)IB<stx8C=s3X~m1fQ1RGx6|aVs5j#uc8VR>AJ5;
zmQ=|S?2?buO~n55sR4d#3!<cETES~zFqiA6M^oqo8jjz8LNeaPiubYRBdq!WvBHOl
z(LctjPXOUl!1w}CKBFf391!-x<nDu$`7-74$`Ipr8D9fE^WohtkbhVKYYgM-`mG7)
zw?~(d>GZYf6&Gr&cUDR_&O&f|5rV0UQ{k@kT!J3q#L<+yAL!ZCUhFu)EqR|)!4f?8
z3S08_gXcDT7R%2XC&{=J$wY$gc7pIlP)-3}3KKRu!E1AL6kEhSt?kGXBRZJnvl%`n
zX`XXsJ{zt$ywpKj$$zH-4&0><+({1HTnBF4f!m%_#OsHIZn~gPN<x<p-~I>a8;69R
zpAEWvYkL5ioO1x049`Xr`BNtct~fwpa@hc^&(m-LJ*RR=*hL!lXnTE1NXm@MBn=hp
z54g)YDcTIZ%a{Y~au%Gj?OgAMVj<|}4cKLT5q}LqDSy4qZhu@@nSQ@G!I#3}+KtO}
z8$*THCirp*wGaW1tEiGJ6ccvyRid=tOz_oP=}0~4JI<sr*(Nz#C;0jssUg+4w1{s?
z@XgKDkInEHGjfV^iaobeMRjq`w7Ohz<hR<7J8q)kSTngKcPHNkCA=hux9<O=KuPeu
zJNYL}&DA^kVSh$E-h-EZrpNgaiOP5KV~jxJr$zj;1pnejYLu?0oG#f};)us)<Qg-~
zVzW5+cB(ANDK@7e67b6A`r&L|S>kmzH?jHiTlZg6VISi+Mf|%2|GuC9AX&KG_oAzB
znnX*s-C9rM!G`fPj1Qv{KAa|TDIEhpSI<Y%T%JTH@qc7$=P7g+SI}y%q!3rpxjdCF
z=V^35A5Gi%7<z=K(^F_a&2{tv*R$f8T*0$=Dxbi|^K4##_F|sL&3IeI3wb@Cl**;<
zr$dZyKs<5*{}AJHym?_YPdBbGt`rN;8<Jv#x3jbu)$>eavsk{AZL{ZJ<@ow$%0Ff=
z!4Kz6_<s@)V+-@-Pbp_FStf6jyvug(I=<&^CO@L55S8zT<a^v>1RI?Z9m*dCIS%)D
z*kDoA;f~DOzU21<HDa+#r-wVP(Cxwh1c0{QNklDrbC_G!e=i>VRxtcVGSTrs<pZf8
ztx%I^2^H{C8q259q1@`yzQY`{70?Ldo4V8_q<`@e@1;W}t5NcIN6yaoVrR*+j}eFX
zGB*4(T;}WIGXH|ewus+M@LM;LRpQaFe??wcWj_-9&on+dMBp~^@u@V5+vzY~Nt5|>
zs^K#<UdPybq^!a*4m;)TY8|}!s6yjv&?wlyYm9F>49zFrhp<6npx1%87e}`dpXHD&
zuYaP5-xa(EQs3{QNM35^JZEPme?pZ7)ce^$1-=@T{C!@kE@hXH@+yn?Ls07DfuMq}
zw8RbS+YUYQoU~QRUphMh&(oluiLtE@@xPItCsTEV{*4duf2EVx?&2>bMcG@qry`-a
z5s7;f#)=g9w6|(cMP)+e>L3ZTtCAIjn}4XFqFNFvm6uSK%+a+HJxNLi0kKAUUU5Z9
zPDLe{u4hV;k&Afhz4jfdaJwq1*rtlA6KYIC9g<KJsvppYE1;1O@*|NpR^xdNeS@yV
z(-xOAX$+1Pf%wK~B==GwpG^}vN=Nbrs^D{}nm0mpHqo(s4js?u(QH1S7W3Drg?}%g
zGx$R4;)^KC7t=X>DSd-4rz`m~x{9x&@A4M9ldn$Y6@^r!BPIqGhQqBIr1R1zyxi(A
z;CKo<qqC89d`B~2G3?5<Qa6B-&NHslm4+xXwd>KBqeb&rGEYIkRCJP#nh?*o?W2jd
z{n$@cl$*3BZ5fq@Eu3Lg3X*jmb$=)%L`qTHA5vviyVPW`Q<dXAp(=NC0sNM#0@t{%
zUsVg2-e|AfL2qdesiVa$m3Z<-spAu>{!}a~Qgg6c#^y;Tnd`h+$Uk$DRU(tj-J@a8
z-%1OcwWOR3Nx@6yF11KYQuQ9YzcJO{Y)hC^A*$X}=e0o~E0uh+2Ek7YB7fRt)DG(J
z!%^1I*=nJFUV+2P^KSf}4Wn~+%5<!vv5<x9$l~iE2j8Vb_y#KD8^QmZXgYt7=J5Av
z5&r<ZzmeAP-4y0~=xn|P{J#~x=r-{GcDjP^fDHVQzQcFYEqoVk<*jr#=01qI+xXs;
zJWQuz<GaQU8rM4GM&l+Z)_)<?WPDF&jb$|7xY_u==JOcH$PdtWB^~a>++a*fUAOCs
zlBnx;m9NXZA`hn#(!Lgl?|DwzX53=Z8>z(696XkhG8(CIqLWRv5JI!11B1Q{nRz%_
ztmg+|7sRsufkg-Jq<lPS!d>KfP})UmNkW~{SUJLclwN5!3iA-f$$w9d{Nxs?<*n_e
z{skY~TH8nD$|IppYpN_#9k4R5B$U6oN>+Q?4T%V`Ud)5+Atpx!2x)u~0K(>U1Ej=6
zfGN=lfZ|cpuhs})yiSwXgbKl{lz0Ffwj>G@Hm*_9EtsBjB;&Fh@+Nhxk$}ESZPd>v
zGm|a;F^%8{U_7?L_kV4tW=_yb-a$9;PB4E5-N(CV2k)U>yqk9OBUt??f|SSTS$<p#
z!^xoAq4YiDHnmdzuYwdbZa410jw|U5<A=tbVE2766L%R~LG#^YK?Ht;c~3dXmN5Pg
zjz7QHaSR%oad!&ZJ&sTer<@V=U;2@$HZ~%U%7bC==GBmW@qZRqIo_h8%E@F$R~b9i
z*K`hBq%KUTi*F*IHqe*dryp0`mx|r=bp-zc$Nwd4=aVkCQjwC=3gcc!PAhaqs9YIg
zh0X|VBt5V`xmv`$fUw25k2X6A-;W_~mnZRM3!_pC=#uM}9qOuP1PJRBYD-&Hb-(&%
zb&>kEG^*i3*MI7lB6V$M2aa%k+irCe;tO@N1jIVeP`5}tq3+PXTWyne?|mr?F@uI-
z@86P_e+Q;NO~w2Sjfcmb#LvM>JP$AN0?p!=5UsvUr|>J(hQR7f{&OnI1imSXbfqZL
zWm5zvKHd0<AwKIQ8gD#kJOpZ-Nx8<u#x~gbBzx`omw%+@ZwGFE?bMaf%SEltNopCd
zLdXh$`OVOd2dnJjL>u0>Ipuqwy!Wde@<^y%GW4j>q;jYFDQ1E=7;wG+%zpPg%8T2L
z5>IQt`encRRb5WM`kmN+X5Oiu^N=nvCe+J2)t?pBd3UQf!K%0F@`Pta>TSInuLZA4
zu=1}vXn$^<4~t98lDrZhBdJjTFsUxTB!8!RABl<j_f5321YZBYj)*qd4fQ!womFBv
zY0i=ICV7tfqHY+xMaeLvH2rGdE)ht0qOJR1^vtkI%qPfKV(v5)Q?YfQG%K9uRw|Wx
z=MywK)sa#5bR<p=mz22@6GDfkEp<3Rj{QstS$~NsQih}{C1qYMWnPi8JUIuXOi?fA
zA<x;zH9Vb<gEhAG>n556-u;C<{D1IGZ^P8QgHZdgbU6PVq3u5rqr6Kq_&wxF@5B6j
zKpp%M;*yU6?O$|0|C=u3Pv|!O5B$%6>8JcD@}tk_L;jo%{(^IPALl9JVm!y<IhjA^
z`F~1rlQMXP^6=>@hXX2?dz8s><>d=h9$%q+d^H01>(wwV*|*aO`VjF=!q@@*I3MPx
z-`EN1yo|nW>@r}c={DM6JOas<|G!<A@u=|_g6Up*-q>S2F5x8KoXW0lPHF|-Y^@l{
zn~k69=%<<^#?K77gzDf~#?RsHa&XS$jDKGkzeL{FL`#e(u!o7r%+?++{J5<>d0KnK
z)Y^DHnZom_6rR6I;kjMzB=!EHW%jPW2KDV7wv(wX)fJStmk!qv)-D?6cuQTx(!Xt{
zdfrs8n#ONT^(MsFR3A90T;*Owo8n@<LoGt`sJ-+Er@WgD?!b!*F_)V&41iDmJb%|o
z6Q99$QmC9!q1C0S%2Af`DqB~m4F=QzWpZw$k(Jf9dROf<ypaC=e@v(8M_?a9zGA9E
z8lj44oEk-Cs+g+OXqu+R(sWglx}h0IV~yYGJPP}2W|Dq;S_*<-MXm9B;~B>hl%{4~
zlA3i%YSy!kbMTR|7l8|Jt5D7<|9=28w?{qhoN_aE6*xyr5Rjm|8Y>?%e1&iJ8^ijI
zkxinvI8rfF<u0RyXs0n=;b)@U;m%DbklLH6@#Iy9QL&of@@7XnQtG8j<2fy*#Yk|U
z&+uk;k9ad1!9NnqA4)n1c01|aq>6+w$w6=m1GywxRc^G>37bx`)g<6F8GmFirz6#5
zR~|Sih1X%m3xZd2?-4%v)W*pNPY~ZKMAUH;BKE+5giw{cVEQy9(r?|8j{w%o{{yTE
z8L*zqghgKCmDE=rtF>Sf%@$ZiMs+_8D>7<#7*iiMj?o#QaZHhMEVg)<|6ODp4`x10
zXBQdu`sLyxW0rooUSyOt0)L}*9C{QL(Nvm<@U@CgMY!D#_WnsD`DeI8N&E_o*RbL(
z{riso{hR*%hyHz6|Guw(Kh(b;>)(It-~Z^}PxbHT5K6;icyc^m=Pl3U^;lY4JoHQY
zoo5*3@gtrB&xqVS^?`ccGcq^NQ|KAx8BHbs4^T@72qtc(6&x%801=H{002-+0|XQR
z2nYxO=%|9T_AHA61L&xNvxF};DFf)Jg0sC?%>e`GsDiVNS}_6x=%|8|!CWID0RT`-
z2MDlq+7bu=000I6002-+0Rj{N6aWYa2mt7)f|CVZLk;Mtf>tJOrWG740051XRb4*=
v=%|8|mt9l?=%|8|?p;L#=%|8|HeOx>=%|8|mtIc@=%|8LuyooIlkQ$TijjPM

diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index f40fc3f..6f6b0bc 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,2 +1,2 @@
 #Sat Apr 01 10:09:33 PDT 2023
-rife2.version=1.5.14
+rife2.version=1.5.16
diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
index 0708b54..bca5131 100644
--- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
+++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
@@ -24,6 +24,8 @@ public class PropertyFileBuild extends Project {
                 .url("https://github.com/rife2/bld-property-file")
                 .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
                         .url("https://erik.thauvin.net/"))
+                .developer(new PublishDeveloper().id("gbevin").name("Geert Bevin").email("geert@uwyn.com")
+                        .url("https://github.com/gbevin"))
                 .license(new PublishLicense().name("The Apache License, Version 2.0")
                         .url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
                 .scm(new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git")
diff --git a/src/main/java/rife/bld/extension/propertyfile/Calc.java b/src/main/java/rife/bld/extension/propertyfile/Calc.java
new file mode 100644
index 0000000..9e90642
--- /dev/null
+++ b/src/main/java/rife/bld/extension/propertyfile/Calc.java
@@ -0,0 +1,50 @@
+/*
+ *  Copyright 2023 the original author or authors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package rife.bld.extension.propertyfile;
+
+import java.util.function.IntFunction;
+
+/**
+ * Implements the calculation functions.
+ *
+ * @author <a href="https://github.com/gbevin">Geert Bevin</a>
+ * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
+ * @since 1.0
+ */
+public final class Calc {
+    public static final IntFunction<Integer> ADD = Calc::add;
+    public static final IntFunction<Integer> SUB = Calc::sub;
+
+    /**
+     * Adds {@code 1} to the value.
+     *
+     * @param v the value
+     */
+    public static Integer add(int v) {
+        return v + 1;
+    }
+
+    /**
+     * Subtracts {@code 1} to the value.
+     *
+     * @param v the value
+     */
+    public static Integer sub(int v) {
+        return v - 1;
+    }
+}
+
diff --git a/src/main/java/rife/bld/extension/propertyfile/Entry.java b/src/main/java/rife/bld/extension/propertyfile/Entry.java
index 7dafd76..a75993a 100644
--- a/src/main/java/rife/bld/extension/propertyfile/Entry.java
+++ b/src/main/java/rife/bld/extension/propertyfile/Entry.java
@@ -16,35 +16,30 @@
 
 package rife.bld.extension.propertyfile;
 
+import java.util.function.BiFunction;
+import java.util.function.IntFunction;
+
 /**
- * <p>Declares the edits to be made to a {@link java.util.Properties Properties} file.</p>
- *
- * <p>The rules used when setting a {@link java.util.Properties property} value are:</p>
- *
- * <ul>
- * <li>If only value is specified, the property is set to it regardless of its previous value.</li>
- * <li>If only default value is specified and the property previously existed, it is unchanged.</li>
- * <li>If only default value is specified and the property did not exist, the property is set to the default value.</li>
- * <li>If value and default value are both specified and the property previously existed, the property is set to value.</li>
- * <li>If value and default value are both specified and the property did not exist, the property is set to the default value.</li>
- * </ul>
- *
- * <p>{@link Operations Operations} occur after the rules are evaluated.</p>
+ * Declares the modifications to be made to a {@link java.util.Properties Properties} file.
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
+ * @author <a href="https://github.com/gbevin">Geert Bevin</a>
  * @since 1.0
  */
 public class Entry {
     private String key;
-    private String value;
     private String defaultValue;
+    private String newValue;
+    private String modifyValue;
+    private boolean isDelete;
     private Types type = Types.STRING;
-    private Operations operation = Operations.SET;
     private String pattern = "";
     private Units unit = Units.DAY;
+    private IntFunction<Integer> calc;
+    private BiFunction<String, String, String> modify;
 
     /**
-     * Creates a new {@link Entry entry} Entry.
+     * Creates a new {@link Entry entry}.
      *
      * @param key the required property key
      */
@@ -53,14 +48,116 @@ public class Entry {
     }
 
     /**
-     * Returns the name of the {@link java.util.Properties property} name/value pair.
+     * Creates a new {@link Entry entry}.
+     *
+     * @param key  the required property key
+     * @param type the value {@link Types Type}
+     */
+    public Entry(String key, Types type) {
+        this.key = key;
+        this.type = type;
+    }
+
+    /**
+     * Returns the value to be used in the {@link #modify} function.
+     */
+    public String getModifyValue() {
+        return modifyValue;
+    }
+
+    /**
+     * Returns the modify function.
+     */
+    public BiFunction<String, String, String> getModify() {
+        return modify;
+    }
+
+    /**
+     * Set the modify function.
+     */
+    public void setModify(BiFunction<String, String, String> modify) {
+        this.modify = modify;
+    }
+
+    /**
+     * Set the modify function.
+     *
+     * @param value the value to perform a modification with
+     */
+    public void setModify(String value, BiFunction<String, String, String> modify) {
+        this.modifyValue = value;
+        this.modify = modify;
+    }
+
+    /**
+     * Creates a new {@link Entry entry}.
+     *
+     * @param value  the value to perform a modification with
+     * @param modify the modification function
+     */
+    public Entry modify(String value, BiFunction<String, String, String> modify) {
+        modifyValue = value;
+        setModify(modify);
+        return this;
+    }
+
+    /**
+     * Creates a new {@link Entry entry}.
+     *
+     * @param modify the modification function
+     */
+    public Entry modify(BiFunction<String, String, String> modify) {
+        setModify(modify);
+        return this;
+    }
+
+    /**
+     * Returns {@code true} if the {@link Entry} is to be deleted.
+     */
+    public boolean isDelete() {
+        return isDelete;
+    }
+
+    /**
+     * Sets whether the {@link Entry} should be deleted.
+     */
+    public void setDelete(boolean delete) {
+        isDelete = delete;
+    }
+
+    /**
+     * Returns the calculation function.
+     */
+    public IntFunction<Integer> getCalc() {
+        return calc;
+    }
+
+    /**
+     * Sets the calculation function.
+     */
+    public void setCalc(IntFunction<Integer> calc) {
+        this.calc = calc;
+    }
+
+    /**
+     * Creates a new {@link Entry entry}.
+     *
+     * @param calc the calculation function.
+     */
+    public Entry calc(IntFunction<Integer> calc) {
+        setCalc(calc);
+        return this;
+    }
+
+    /**
+     * Returns the key of the {@link java.util.Properties property}.
      */
     public String getKey() {
         return key;
     }
 
     /**
-     * Sets the name of the {@link java.util.Properties property} name/value pair.
+     * Sets the key of the {@link java.util.Properties property}.
      *
      * @param key the {@link java.util.Properties property} key
      */
@@ -68,22 +165,6 @@ public class Entry {
         this.key = key;
     }
 
-    /**
-     * Returns the value of the {@link java.util.Properties property}.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the {@link java.util.Properties property}.
-     *
-     * @param value the {@link java.util.Properties property} value
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
     /**
      * Returns the default value.
      */
@@ -92,7 +173,7 @@ public class Entry {
     }
 
     /**
-     * <p>Sets the initial value to set for the {@link java.util.Properties property} if not already defined.</p>
+     * <p>Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.</p>
      *
      * <p>The {@code now} keyword can be used for {@link Types#DATE Types.DATE}</p>
      *
@@ -103,7 +184,7 @@ public class Entry {
     }
 
     /**
-     * Return the value {@link Types Type}/
+     * Return the value {@link Types Type}.
      */
     public Types getType() {
         return type;
@@ -118,22 +199,6 @@ public class Entry {
         this.type = type;
     }
 
-    /**
-     * Return the {@link Operations Operation}.
-     */
-    public Operations getOperation() {
-        return operation;
-    }
-
-    /**
-     * Sets the {@link Operations Operation} to be performed on the {@link java.util.Properties property} value,
-     *
-     * @param operation the entry {@link Operations Operation}
-     */
-    public void setOperation(Operations operation) {
-        this.operation = operation;
-    }
-
     /**
      * Returns the pattern.
      */
@@ -142,9 +207,8 @@ public class Entry {
     }
 
     /**
-     * <p>Parses the value of {@link Types#INT Types.INT} and {@link Types#DATE Types.DATE} to
-     * {@link java.text.DecimalFormat DecimalFormat} and {@link java.text.SimpleDateFormat SimpleDateFormat}
-     * respectively.</p>
+     * Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.text.SimpleDateFormat SimpleDateFormat}
+     * pattern to be used with {@link Types#INT Types.INT} or {@link Types#DATE Types.DATE} respectively.
      *
      * @param pattern the pattern
      */
@@ -160,8 +224,8 @@ public class Entry {
     }
 
     /**
-     * Sets the {@link Units unit} value to apply to {@link Operations#ADD Operations.ADD}
-     * and {@link Operations#SUBTRACT Operations.SUBTRACT} for {@link Types#DATE Types.DATE}.
+     * Sets the {@link Units unit} value to apply to {@link Calc#ADD add} and {@link Calc#SUB subtract} calculations
+     * for {@link Types#DATE Types.DATE}.
      *
      * @param unit the {@link Units unit}
      */
@@ -170,11 +234,10 @@ public class Entry {
     }
 
     /**
-     * Sets the name of the {@link java.util.Properties property} name/value pair.
+     * Sets the key of the {@link java.util.Properties property}.
      *
      * @param key the {@link java.util.Properties property} key
      */
-
     @SuppressWarnings("unused")
     public Entry key(String key) {
         setKey(key);
@@ -182,22 +245,31 @@ public class Entry {
     }
 
     /**
-     * Sets the value of the {@link java.util.Properties property}.
+     * Returns the new value to set the {@link java.util.Properties property)} to.
+     */
+    public String getNewValue() {
+        return newValue;
+    }
+
+    /**
+     * Sets a new value to set the {@link java.util.Properties property} to, regardless of its previous value.
      *
-     * @param value the {@link java.util.Properties property} value
+     * <p>The {@code now} keyword can be used for {@link Types#DATE Types.DATE}</p>
+     *
+     * @param newValue the {@link java.util.Properties property} new value
      */
     @SuppressWarnings("unused")
-    public Entry value(Object value) {
-        if (value != null) {
-            setValue(String.valueOf(value));
+    public Entry set(Object newValue) {
+        if (newValue != null) {
+            this.newValue = String.valueOf(newValue);
         } else {
-            setValue(null);
+            this.newValue = null;
         }
         return this;
     }
 
     /**
-     * <p>Sets the initial value to set for the {@link java.util.Properties property} if not already defined.</p>
+     * <p>Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.</p>
      *
      * <p>The {@code now} keyword can be used for {@link Types#DATE Types.DATE}</p>
      *
@@ -224,18 +296,7 @@ public class Entry {
     }
 
     /**
-     * Sets the {@link Operations Operation} to be performed on the {@link java.util.Properties property} value,
-     *
-     * @param operation the entry {@link Operations Operation}
-     */
-    @SuppressWarnings("unused")
-    public Entry operation(Operations operation) {
-        setOperation(operation);
-        return this;
-    }
-
-    /**
-     * <p>Parses the value of {@link Types#INT Types.INT} and {@link Types#DATE Types.DATE} to
+     * <p>Sets the pattern for {@link Types#INT Types.INT} and {@link Types#DATE Types.DATE} to
      * {@link java.text.DecimalFormat DecimalFormat} and {@link java.text.SimpleDateFormat SimpleDateFormat}
      * respectively.</p>
      *
@@ -247,8 +308,8 @@ public class Entry {
     }
 
     /**
-     * Sets the {@link Units unit} value to apply to {@link Operations#ADD Operations.ADD}
-     * and {@link Operations#SUBTRACT Operations.SUBTRACT} for {@link Types#DATE Types.DATE}.
+     * Sets the {@link Units unit} value to apply to {@link Calc#ADD add} and {@link Calc#SUB subtract} calculations
+     * for {@link Types#DATE Types.DATE}.
      *
      * @param unit the {@link Units unit}
      */
@@ -258,6 +319,14 @@ public class Entry {
         return this;
     }
 
+    /**
+     * Sets the {@link Entry entry} up for deletion.
+     */
+    public Entry delete() {
+        isDelete = true;
+        return this;
+    }
+
     /**
      * The available datatypes.
      *
@@ -272,23 +341,8 @@ public class Entry {
     }
 
     /**
-     * The operations available for all {@link Types Types}.
-     *
-     * <uL>
-     * <li>{@link Operations#ADD ADD} adds a value to an {@link Entry entry}</li>
-     * <li>{@link Operations#DELETE DELETE} deletes an entry</li>
-     * <li>{@link Operations#SET SET} sets the entry value. This is the default operation</li>
-     * <li>{@link Operations#SUBTRACT SUBTRACT} subtracts a value from the {@link Entry entry}.
-     * For {@link Types#INT Types.INT} and {@link Types#DATE Types.DATE} only.</li>
-     * </uL>
-     */
-    public enum Operations {
-        ADD, DELETE, SET, SUBTRACT
-    }
-
-    /**
-     * The units available for {@link Types#DATE Type.DATE} with {@link Operations#ADD Operations>ADD}
-     * and {@link Operations#SUBTRACT Operations.SUBTRACT}.
+     * The units available for {@link Types#DATE Type.DATE} {@link Calc#ADD add}
+     * and {@link Calc#SUB subtract} calculations.
      *
      * <uL>
      * <li>{@link Units#SECOND SECOND}</li>
diff --git a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
index 1692a99..bd6757a 100644
--- a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
+++ b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
@@ -17,8 +17,6 @@
 package rife.bld.extension.propertyfile;
 
 import rife.bld.Project;
-import rife.bld.extension.propertyfile.Entry.Operations;
-import rife.bld.extension.propertyfile.Entry.Types;
 import rife.bld.operations.AbstractOperation;
 
 import java.io.File;
@@ -36,9 +34,9 @@ import java.util.Properties;
 public class PropertyFileOperation extends AbstractOperation<PropertyFileOperation> {
     private final List<Entry> entries = new ArrayList<>();
     private final Project project;
-    private File file = null;
+    private File file;
     private String comment = "";
-    private boolean failOnWarning = false;
+    private boolean failOnWarning;
 
     public PropertyFileOperation(Project project) {
         this.project = project;
@@ -122,17 +120,13 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
                     success = false;
                 } else {
                     var key = entry.getKey();
-                    var value = entry.getValue();
+                    var value = entry.getNewValue();
                     var defaultValue = entry.getDefaultValue();
-                    if ((value == null || value.isBlank()) && (defaultValue == null || defaultValue.isBlank())
-                            && entry.getOperation() != Operations.DELETE) {
-                        PropertyFileUtils.warn(commandName, "An entry value or default must be specified: " + key);
-                        success = false;
-                    } else if (entry.getType() == Types.STRING && entry.getOperation() == Operations.SUBTRACT) {
-                        PropertyFileUtils.warn(commandName, "Subtraction is not supported for String properties: " + key);
-                        success = false;
-                    } else if (entry.getOperation() == Operations.DELETE) {
+                    if (entry.isDelete()) {
                         properties.remove(key);
+                    } else if ((value == null || value.isBlank()) && (defaultValue == null || defaultValue.isBlank())) {
+                        PropertyFileUtils.warn(commandName, "An entry must be set or have a default value: " + key);
+                        success = false;
                     } else {
                         switch (entry.getType()) {
                             case DATE ->
diff --git a/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java b/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
index f3d6869..eb47799 100644
--- a/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
+++ b/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
@@ -16,7 +16,6 @@
 
 package rife.bld.extension.propertyfile;
 
-import rife.bld.extension.propertyfile.Entry.Operations;
 import rife.bld.extension.propertyfile.Entry.Units;
 import rife.tools.Localization;
 
@@ -45,7 +44,7 @@ import java.util.logging.Logger;
 public final class PropertyFileUtils {
     private final static Logger LOGGER = Logger.getLogger(PropertyFileUtils.class.getName());
 
-    private final static Map<Units, Integer> calendarFields =
+    private final static Map<Units, Integer> CALENDAR_FIELDS =
             Map.of(Units.MILLISECOND, Calendar.MILLISECOND,
                     Units.SECOND, Calendar.SECOND,
                     Units.MINUTE, Calendar.MINUTE,
@@ -70,8 +69,8 @@ public final class PropertyFileUtils {
     public static boolean processDate(String command, Properties p, Entry entry, boolean failOnWarning) {
         var success = true;
         var cal = Calendar.getInstance();
-        var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getValue(),
-                entry.getDefaultValue(), entry.getOperation());
+        String value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+                entry.getNewValue());
 
         var pattern = entry.getPattern();
         SimpleDateFormat fmt;
@@ -80,6 +79,7 @@ public final class PropertyFileUtils {
         } else {
             fmt = new SimpleDateFormat(entry.getPattern(), Localization.getLocale());
         }
+
         if ("now".equalsIgnoreCase(value) || value.isBlank()) {
             cal.setTime(new Date());
         } else {
@@ -92,74 +92,36 @@ public final class PropertyFileUtils {
             }
         }
 
-        if (entry.getOperation() != Entry.Operations.SET) {
-            var offset = 0;
+        var offset = 0;
 
-            try {
-                offset = Integer.parseInt(entry.getValue());
-                if (entry.getOperation() == Entry.Operations.SUBTRACT) {
-                    offset *= -1;
-                }
-            } catch (NumberFormatException nfe) {
-                warn(command, "Non-date value for \"" + entry.getKey() + "\" --> " + nfe.getMessage(), nfe,
-                        failOnWarning);
-                success = false;
-            }
-
-            //noinspection MagicConstant
-            cal.add(calendarFields.getOrDefault(entry.getUnit(), Calendar.DATE), offset);
+        if (entry.getCalc() != null) {
+            offset = entry.getCalc().apply(offset);
         }
 
+        //noinspection MagicConstant
+        cal.add(CALENDAR_FIELDS.getOrDefault(entry.getUnit(), Calendar.DATE), offset);
+
         p.setProperty(entry.getKey(), fmt.format(cal.getTime()));
 
         return success;
     }
 
     /**
-     * Return the current value, new value or default value based on the specified {@link Operations operation}.
+     * Returns the new value, value or default value depending on which is specified.
      *
      * @param value        the value
      * @param newValue     the new value
      * @param defaultValue the default value
-     * @param operation    the {@link Operations operation}
      * @return the current value
      */
-    public static String currentValue(String value, String newValue, String defaultValue, Operations operation) {
-        String result = null;
-
-        if (operation == Entry.Operations.SET) {
-            if (newValue != null && defaultValue == null) {
-                result = newValue;
-            }
-            if (defaultValue != null) {
-                if (newValue == null && value != null) {
-                    result = value;
-                }
-
-                if (newValue == null && value == null) {
-                    result = defaultValue;
-                }
-
-                if (newValue != null && value != null) {
-                    result = newValue;
-                }
-
-                if (newValue != null && value == null) {
-                    result = defaultValue;
-                }
-            }
+    public static String currentValue(String value, String defaultValue, String newValue) {
+        if (newValue != null) {
+            return newValue;
+        } else if (value == null) {
+            return defaultValue;
         } else {
-            if (value == null) {
-                result = defaultValue;
-            } else {
-                result = value;
-            }
+            return value;
         }
-
-        if (result == null) {
-            result = "";
-        }
-        return result;
     }
 
     /**
@@ -172,28 +134,18 @@ public final class PropertyFileUtils {
      */
     public static boolean processInt(String command, Properties p, Entry entry, boolean failOnWarning) {
         var success = true;
-        int intValue;
+        int intValue = 0;
         try {
             var fmt = new DecimalFormat(entry.getPattern());
-            var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getValue(),
-                    entry.getDefaultValue(), entry.getOperation());
+            String value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+                    entry.getNewValue());
 
-            if (value.isBlank()) {
-                intValue = fmt.parse("0").intValue();
-            } else {
+            if (value != null) {
                 intValue = fmt.parse(value).intValue();
             }
 
-            if (entry.getOperation() != Entry.Operations.SET) {
-                var opValue = 1;
-                if (entry.getValue() != null) {
-                    opValue = fmt.parse(entry.getValue()).intValue();
-                }
-                if (entry.getOperation() == Entry.Operations.ADD) {
-                    intValue += opValue;
-                } else if (entry.getOperation() == Entry.Operations.SUBTRACT) {
-                    intValue -= opValue;
-                }
+            if (entry.getCalc() != null) {
+                intValue = entry.getCalc().apply(intValue);
             }
             p.setProperty(entry.getKey(), fmt.format(intValue));
         } catch (NumberFormatException | ParseException e) {
@@ -213,15 +165,13 @@ public final class PropertyFileUtils {
      * @return {@code true} if successful
      */
     public static boolean processString(Properties p, Entry entry) {
-        var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getValue(),
-                entry.getDefaultValue(), entry.getOperation());
+        var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+                entry.getNewValue());
 
-        if (entry.getOperation() == Entry.Operations.SET) {
-            p.setProperty(entry.getKey(), value);
-        } else if (entry.getOperation() == Entry.Operations.ADD) {
-            if (entry.getValue() != null) {
-                p.setProperty(entry.getValue(), "$value${entry.value}");
-            }
+        p.setProperty(entry.getKey(), value);
+
+        if (entry.getModify() != null && entry.getModifyValue() != null) {
+            p.setProperty(entry.getKey(), entry.getModify().apply(p.getProperty(entry.getKey()), entry.getModifyValue()));
         }
 
         return true;
diff --git a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
index 4448272..5471073 100644
--- a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
+++ b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
@@ -27,6 +27,8 @@ import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static rife.bld.extension.propertyfile.Calc.ADD;
+import static rife.bld.extension.propertyfile.Calc.SUB;
 
 /**
  * PropertyFileUtilsTest class
@@ -38,151 +40,131 @@ class PropertyFileUtilsTest {
     final Properties p = new Properties();
     final String t = "test";
 
-    @Test
-    void currentValueTest() {
-        String prev = "previous";
-        String value = "value";
-        String defaultValue = "defaultValue";
-        var operation = Entry.Operations.SET;
-
-        // If only value is specified, the property is set to it regardless of its previous value.
-        assertThat(PropertyFileUtils.currentValue(prev, value, null, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(value);
-
-        // If only defaultValue is specified and the property previously existed, it is unchanged.
-        assertThat(PropertyFileUtils.currentValue(prev, null, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(prev);
-
-        // If only defaultValue is specified and the property did not exist, the property is set to defaultValue.
-        assertThat(PropertyFileUtils.currentValue(null, null, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
-
-        // If value and defaultValue are both specified and the property previously existed, the property is set to value.
-        assertThat(PropertyFileUtils.currentValue(prev, value, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(value);
-
-        // If value and defaultValue are both specified and the property did not exist, the property is set to defaultValue.
-        assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
-
-        // ADD
-        operation = Entry.Operations.ADD;
-
-        assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
-
-        assertThat(PropertyFileUtils.currentValue(prev, value, null, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(prev);
-
-        assertThat(PropertyFileUtils.currentValue(null, value, null, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo("");
-
-        assertThat(PropertyFileUtils.currentValue(null, value, defaultValue, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo(defaultValue);
-
-        assertThat(PropertyFileUtils.currentValue(null, null, null, operation))
-                .as(String.format("currentValue(%s,%s,%s,%s)", prev, value, defaultValue, operation)).isEqualTo("");
-    }
-
     @Test
     void processStringTest() {
-        var entry = new Entry("version.major").value("1");
+        var entry = new Entry("version.major").set("1");
 
         PropertyFileUtils.processString(p, entry);
 
-        assertThat(entry.getValue()).as("processString(entry.getKey(), entry.getValue())").isEqualTo(p.getProperty(entry.getKey()));
+        assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+                .isEqualTo(p.getProperty(entry.getKey()));
 
         entry.setKey("version.minor");
-        entry.setValue("0");
 
+        PropertyFileUtils.processString(p, entry.set(0));
+        assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+                .isEqualTo(p.getProperty(entry.getKey()));
+
+        // APPEND
+        PropertyFileUtils.processString(p, entry.modify("-foo", String::concat));
+        assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+                .isEqualTo("0-foo");
+
+        // PREPEND
+        PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
+        assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+                .isEqualTo("foo-0");
+        // CAP
+        PropertyFileUtils.processString(p, entry.set(t).modify((v, s) -> v.toUpperCase(Localization.getLocale())));
+        assertThat(p.getProperty(entry.getKey())).as("capitalize").isEqualTo(t.toUpperCase(Localization.getLocale()));
+
+        // REPLACE
+        entry.set(t).setModify("T", (v, s) -> v.replace("t", s));
         PropertyFileUtils.processString(p, entry);
-        assertThat(entry.getValue()).as("processString(entry.getKey(), entry.getValue())").isEqualTo(p.getProperty(entry.getKey()));
+        assertThat(p.getProperty(entry.getKey())).as("replace").isEqualTo("TesT");
+
+        // SUBSTRING
+        entry.set(t).setModify((v, s) -> v.substring(1));
+        PropertyFileUtils.processString(p, entry);
+        assertThat(p.getProperty(entry.getKey())).as("substring").isEqualTo(t.substring(1));
     }
 
     @Test
     void processIntTest() {
-        var entry = new Entry("version.patch").value("a").type(Entry.Types.INT);
-        assertThat(PropertyFileUtils.processInt(t, p, entry, false)).as("parseInt(entry.getKey(), a)");
+        var entry = new Entry("version.patch").type(Entry.Types.INT);
 
         // ADD
-        entry.setOperation(Entry.Operations.ADD);
-
-        entry.setValue("1");
+        entry.calc(ADD);
         entry.setDefaultValue("-1");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0)").isEqualTo("0");
+        assertThat(p.getProperty(entry.getKey())).as("add(-1)").isEqualTo("0");
 
         entry.setKey("anint");
-        entry.setValue(null);
         entry.setDefaultValue("0");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 1)").isEqualTo("1");
+        assertThat(p.getProperty(entry.getKey())).as("add(0)").isEqualTo("1");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 2)").isEqualTo("2");
+        assertThat(p.getProperty(entry.getKey())).as("add(1)").isEqualTo("2");
 
         entry.setKey("formated.int");
-        entry.setValue(null);
         entry.setDefaultValue("0013");
         entry.setPattern("0000");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0014)").isEqualTo("0014");
+        assertThat(p.getProperty(entry.getKey())).as("add(0013)").isEqualTo("0014");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0015)").isEqualTo("0015");
+        assertThat(p.getProperty(entry.getKey())).as("add(0014)").isEqualTo("0015");
 
         entry.setKey("formated.int");
-        entry.setValue("2");
+        entry.calc(v -> v + 2);
         entry.setDefaultValue("0013");
         entry.setPattern("0000");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0017)").isEqualTo("0017");
+        assertThat(p.getProperty(entry.getKey())).as("add(0013)+2").isEqualTo("0017");
 
         // SUBTRACT
-        entry.setOperation(Entry.Operations.SUBTRACT);
-        entry.setValue(null);
-        entry.setDefaultValue("0013");
+        entry.calc(SUB);
         entry.setPattern("0000");
         PropertyFileUtils.processInt(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processInt(entry.getKey(), 0016)").isEqualTo("0016");
+        assertThat(p.getProperty(entry.getKey())).as("sub(0017)").isEqualTo("0016");
+
+        PropertyFileUtils.processInt(t, p, entry.calc(v -> v - 3), true);
+        assertThat(p.getProperty(entry.getKey())).as("sub(0017)-3").isEqualTo("0013");
     }
 
     @Test
     void processDateTest() {
-        var entry = new Entry("adate").type(Entry.Types.DATE).pattern("D").value("1");
+        var entry = new Entry("adate", Entry.Types.DATE).pattern("D");
         var day = new SimpleDateFormat(entry.getPattern(), Localization.getLocale()).format(new Date());
         var dayInt = Integer.parseInt(day);
 
-        entry.setValue("a");
-        assertThat(PropertyFileUtils.processDate(t, p, entry, false)).as("processDate(entry.getKey(), a)").isFalse();
+        assertThat(PropertyFileUtils.processDate(t, p, entry.set("a"), false)).as("processDate(a)").isFalse();
 
-        entry.setValue("99");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), 99)").isEqualTo("99");
+        PropertyFileUtils.processDate(t, p, entry.set("99"), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(99)").isEqualTo("99");
 
-        entry.setValue("now");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now)").isEqualTo(day);
+        PropertyFileUtils.processDate(t, p, entry.set("noew"), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(now)").isEqualTo(day);
 
         // ADD
-        entry.setOperation(Entry.Operations.ADD);
+        entry.setCalc(ADD);
+        PropertyFileUtils.processDate(t, p, entry.set(dayInt), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)").isEqualTo(String.valueOf(dayInt + 1));
 
-        entry.setValue("1");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+1)").isEqualTo(String.valueOf(dayInt + 1));
-
-        entry.setValue("2");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now+3)").isEqualTo(String.valueOf(dayInt + 3));
+        entry.setCalc(v -> v + 3);
+        PropertyFileUtils.processDate(t, p, entry.set(dayInt), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(now+3)").isEqualTo(String.valueOf(dayInt + 3));
 
         // SUBTRACT
-        entry.setOperation(Entry.Operations.SUBTRACT);
-        entry.setValue("3");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-3)").isEqualTo(String.valueOf(dayInt));
+        entry.setCalc(SUB);
+        PropertyFileUtils.processDate(t, p, entry.set(dayInt), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(now-3)").isEqualTo(String.valueOf(dayInt - 1));
 
-        entry.setOperation(Entry.Operations.SUBTRACT);
-        entry.setValue("2");
-        PropertyFileUtils.processDate(t, p, entry, true);
-        assertThat(p.getProperty(entry.getKey())).as("processDate(entry.getKey(), now-2)").isEqualTo(String.valueOf(dayInt - 2));
+        entry.setCalc(v -> v - 2);
+        PropertyFileUtils.processDate(t, p, entry.set(dayInt), true);
+        assertThat(p.getProperty(entry.getKey())).as("processDate(now-2)").isEqualTo(String.valueOf(dayInt - 2));
+    }
+
+    @Test
+    void testCurrentValue() {
+        var value = "value";
+        var defaultValue = "default";
+        var newValue = "new";
+
+        assertThat(PropertyFileUtils.currentValue(value, defaultValue, newValue)).as("all").isEqualTo(newValue);
+        assertThat(PropertyFileUtils.currentValue(value, null, null)).as("value").isEqualTo(value);
+        assertThat(PropertyFileUtils.currentValue(value, defaultValue, null)).as("value not default").isEqualTo(value);
+        assertThat(PropertyFileUtils.currentValue(null, defaultValue, null)).as("default").isEqualTo(defaultValue);
+        assertThat(PropertyFileUtils.currentValue(null, null, newValue)).as("new").isEqualTo(newValue);
     }
 
     @Test