Removed evaluator, added maps.