More changes to models and databases