Fix fields definition, map more fields and enable needed modules.