Updated to support evaluation history