Adding support fot the path expansion