Adding custom domain support