Added site_name manipulation