Refactored entity classes
Add repository