Be smarter about remote creation