Initial addition of extension code