Added some missing fields