Refactored id -> path