Added few more struct fields.