M117 updates

Corrected #170 ConstantOverTime overlapping

Added interface to support multiple data store types.