Adding comments to extender and a couple of performance tweaks