Add more fields
Add sample data