Updated template
Better path handling