Fix evaluation subprogram
Modify some import statements