Switched from array to more performant linked list