Refactored states
Dynamic data models