Add explicit home support