Add timeouts for remote data sources

Address the issue that started #807 . 
The more robust capacity should come with the DB implementation in the next few weeks