[NX-547] Add missing requires
[NX-547] Add @override