Add DB tables
Cleanup