NLEX improvements