#34. Refactor data model
- refactor data objects