More extension method updates