Added yet more fields #8436