Improved the path configuration