Refactoring to customize enabled evaluation methods and metrics. Preparing to include a new ev model