Update of the structure

Signed-off-by: Tom_48_97 <tom_48_97@me.com>