Added home directory expansion