Updated evaluation methods