Added some more struct members.