Addition changes to support the domain field