Orders model and collection refactoring