Fix: unit field is optional