#34. Refactor data model
- round repository refactoring