Move to collecting to lists rather than arrays