Updated Auto-path functions to be more accurate and efficient.