Adding multi site capability