Improved file system support