Refactoring to FileResourceStorage