Refactored remote creation