Updated relative path support