Refactored to do paths with Pathname