HACK: add fields and offsets
2 files changed