Add full path support