added associations, etc