Small refactor
Adding base remote gateway