Refactor data model