[David]--add more entity class