Update to include main models and collections