Added some more fields.