Add more fields and continue to think
Add more fields
Changing fields to DB folder for consistency