Update headers and add DomainUtility class