Formatting
Added index mapping for aggregate measurement
Added header painting
Added fact painting