Updated the way file paths are handled