finish domain class development