Change pre mode to nested arrays. Closes #1187