added associations and user id column