More new fields f-me/carma#1784 f-me/carma#1783 f-me/carma#1782