Updated Location fields, and added RDA fields