Add components again dues some bugs in the handling of xamarin components