added associations, user_id, etc