Add evaluate support