Updated to include id string