Updated to use new model structure.
Add more real data to database.