Changes for Work with Paths