Added linked list support