Updated extension logic.