Next version, added omitted fields