Updating some of the extension methods