Refactored FileStorage