Changes for Xamarin