Include tracking for further insights
Fix member data computation