Automatically add remote id if not provided