Added load local data support