Use more universal paths