Change evaluation function structure