Add heatmap and latest libcat