Improve expandHome