Use Path instead of File
Simplify plugin stuff