Added custom domain support