Cleanup code to increment if values are missing
Add indication to the new data messages of the time period covered