Updated data models & migrations