Integration with FileStore 2.0