refactored model configuration