Modified to set user_id