First steps to full compatibility with Xamarin