ExtensionsMethods code modified