Adding expandPath