Updated to be compatible with Nori 2.0.0