New version with names instead of paths