Fix: using deprecated data structures