Updated for flysystem