Added custom domain handler