Now allows for path expansion