Updated DB structure with data collection