Improve domainClass