domain class and enum update