Added support for site="foo" parameter