Refactored model config factories
Reporter refactor