Change evaluation API to verion 4.0