Adapting our framework to ndarray data