Added full path support.