Changed to generic linked list