Some more refactoring. Simplified the code by pre-processing key path columns into association values.
Minor version bump.