add Entity class and ut