fixes
refactor data model