Updated CSV builder to use new locations