Added enum for evaluation methods
Added evaluation timer