Evaluation refactoring + add sample data