Removed dependency on local file system