Added support for more sites