domain class redesign