Fixed multistage list, improve ENML and test case.