support for path expansion added