Fix generator load bug, remove lists