added fields for id, ...