Fix: struct types