Add evaluation class structures