Adjust database
Update model
Merge pull request #137 from BeshoSmile/Database

Adjust database