Added base collection and model class