Adding Support for Custom Domains