Update to models and complete database

Update to models and complete database