Refactor Models and Collection initialize