Change paths to also cover legacy