Modify model structures and associations