Still adapting our framework to ndarray data