Added support for multiple sites