Refactor entity classes
Refactor entities class using annotations