Added support for custom domain