Updated for custom domain