Modified to support remote server