DomainClass ast improvements