Refactor Device data, add Person data.