Added more granular data features