Added support for custom domains