Fix: trad structure optimization
Fix: try to optimize