Database is set

Fix the models and tables