Added entity classes.
Merged.