Changed to use site names instead of ids