Initial addition of extension functionality