Improve integration with remote nodes