Updated to handle multiple sites