Refactored
Changed to use fs instead of special adapter