Using ModelEvaluator for class model management
Reordered constructor parameters
Automatic preparation of unprepared arguments