Added support for different domains