Add more eval and stats