Enhance entity class for extend method  &&  enhance and fix block form