Rebuild database model and databases collection to be more useful