Updated data model to fetch more info