Added 'query' and 'url' datasources.