Updated path support