Updates for workingdirectory and fast storage