Update with better references to the i7/extensions group