Added key property
Changed key property name by id