Changed to use a single dictionary gmvs_per_site