Updated arrayify to work nicely with new models