Add path expansion support