More migrations and entity changes