Add path join and sep