added associations and migrations