Work in progress for Files Gateway