[wip] Adding additional fields