Adding structures for the evaluation feature (WIP)
NWC
Minor route change