Add more fields to database creation, improved SQL statements.