WIP: Updates for NX 2.4