Tweaking organization extension support.