Prepare evaluation.rb for move to new template sys

- Prepare evaluation model for migration to new template system