Add from/until epochs to evaluation routines