Refactored data into WarpData