IntensityMap integration, metric data persistence and minor bug fixes