fixed model and collections