Fix: Missing fields