Added user_id association to sample and users