Ingo/extensions stats

Merge long waiting code changes