Added relative path support