add remote and grid support