Refactored based on Xamarin.Utilities changes