polishing and add kinds property to Entity class