Added HOME path support