1. Extended database structure
2. Extended data collection scripts to collect more data