Datafetcher improvements