Simplify to just include paths